--- font.c.orig	Sat Mar  3 22:31:05 2001
+++ font.c	Sun Mar  4 00:47:03 2001
@@ -771,6 +771,551 @@
 
 	/* BUG! font7Hebrew? */
 
+	static unsigned char font0a[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,8,8,
+		6,5,5,5,5,5,5,5,
+		2,2,4,8,6,8,7,2,
+		4,4,6,6,3,4,2,5,
+		5,5,5,5,5,5,5,5,
+		5,5,2,3,6,6,6,5,
+		8,5,5,5,6,4,4,6,
+		6,2,4,6,5,8,6,7,
+		5,7,5,5,6,6,6,8,
+		6,6,6,3,5,3,6,4,
+		3,5,5,4,5,5,4,5,
+		5,2,3,5,2,8,5,5,
+		5,5,4,4,4,5,5,6,
+		6,6,4,4,2,4,7,5,
+		5,5,5,5,6,4,8,5,
+		6,6,6,5,8,6,7,6,
+		5,5,6,5,8,6,6,6,
+		8,8,7,7,6,6,8,6,
+		5,5,5,4,6,5,6,4,
+		5,5,5,5,6,5,5,5,
+		5,6,4,4,3,5,6,2,
+		5,2,5,6,8,8,8,5,
+		5,5,5,5,6,4,8,5,
+		6,6,6,5,8,6,7,6,
+		5,5,6,5,8,6,6,6,
+		8,8,7,7,6,6,8,6,
+		5,4,4,5,6,6,6,5,
+		6,7,6,7,5,5,6,5,
+		4,5,4,5,6,6,6,5,
+		6,7,6,7,5,5,6,5};
+
+	static unsigned char font0k[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,8,8,
+		6,5,5,5,5,5,5,5,
+		2,2,4,8,6,8,7,2,
+		4,4,6,6,3,4,2,5,
+		5,5,5,5,5,5,5,5,
+		5,5,2,3,6,6,6,5,
+		8,5,5,5,6,4,4,6,
+		6,2,4,6,5,8,6,7,
+		5,7,5,5,6,6,6,8,
+		6,6,6,3,5,3,6,4,
+		3,5,5,4,5,5,4,5,
+		5,2,3,5,2,8,5,5,
+		5,5,4,4,4,5,5,6,
+		6,6,4,4,2,4,7,5,
+		5,5,3,8,5,6,6,6,
+		4,11,5,4,8,10,10,10,
+		10,3,3,5,5,4,4,7,
+		7,10,4,4,8,8,8,6,
+		2,2,6,4,8,6,2,5,
+		4,8,5,6,6,4,8,6,
+		5,6,4,5,3,5,6,2,
+		5,2,5,6,8,8,8,5,
+		6,5,5,6,6,5,6,4,
+		6,5,5,5,5,6,5,5,
+		5,5,5,4,4,5,6,5,
+		5,7,4,6,5,7,5,6,
+		8,5,5,6,6,4,8,5,
+		6,6,6,6,5,8,6,7,
+		6,6,5,5,6,5,8,5,
+		6,7,5,8,6,8,6,7};
+
+	static unsigned char font0m[] = {
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,8,8,6,5,
+		5,5,5,5,5,5,2,2,
+		4,8,6,8,7,2,4,4,
+		6,6,3,4,2,5,5,5,
+		5,5,5,5,5,5,5,5,
+		2,3,6,6,6,5,8,5,
+		5,5,6,4,4,6,6,2,
+		4,6,5,8,6,7,5,7,
+		5,5,6,6,6,8,6,6,
+		6,3,5,3,6,4,3,5,
+		5,4,5,5,4,5,5,2,
+		3,5,2,8,5,5,5,5,
+		4,4,4,5,5,6,6,6,
+		4,4,2,4,7,5,5,5,
+		5,5,6,4,8,5,6,6,
+		6,5,8,6,7,6,5,5,
+		6,5,8,6,6,6,8,8,
+		7,7,6,6,8,6,2,2,
+		6,6,8,6,2,5,4,8,
+		5,6,6,4,8,6,5,6,
+		4,4,3,5,6,2,5,2,
+		5,6,8,8,8,5,5,5,
+		5,5,6,4,8,5,6,6,
+		6,5,8,6,7,6,5,5,
+		6,5,8,6,6,6,8,8,
+		7,7,6,4,5,5,5,5,
+		5,4,6,5,6,4,5,5,
+		5,5,6,5,5,5,5,4,
+		4,5,6,6,6,5,6,7,
+		6,7,5,5,6,5,0,0,
+		5,5,5,5,5,5,5,5};
+
+	static unsigned char font0w[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,8,8,
+		6,5,5,5,5,5,5,5,
+		2,2,4,8,6,8,7,2,
+		4,4,6,6,3,4,2,5,
+		5,5,5,5,5,5,5,5,
+		5,5,2,3,6,6,6,5,
+		8,5,5,5,6,4,4,6,
+		6,2,4,6,5,8,6,7,
+		5,7,5,5,6,6,6,8,
+		6,6,6,3,5,3,6,4,
+		3,5,5,4,5,5,4,5,
+		5,2,3,5,2,8,5,5,
+		5,5,4,4,4,5,5,6,
+		6,6,4,4,2,4,7,5,
+		5,5,3,8,5,6,6,6,
+		4,11,5,4,8,10,10,10,
+		10,3,3,5,5,4,4,7,
+		7,10,4,4,8,8,8,6,
+		2,2,6,6,8,6,2,5,
+		4,8,5,6,6,4,8,6,
+		5,6,4,4,3,5,6,2,
+		5,2,5,6,8,8,8,5,
+		5,5,5,5,6,4,8,5,
+		6,6,6,5,8,6,7,6,
+		5,5,6,5,8,6,6,6,
+		8,8,7,7,6,6,8,6,
+		5,5,5,4,6,5,6,4,
+		5,5,5,5,6,5,5,5,
+		5,4,4,5,6,6,6,5,
+		6,7,6,7,5,5,6,5};
+
+	static unsigned char font1a[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,10,8,
+		6,6,5,5,5,5,5,5,
+		2,3,6,10,6,13,9,3,
+		5,5,6,6,3,5,3,6,
+		6,6,6,6,6,6,6,6,
+		6,6,3,3,6,6,6,6,
+		10,7,7,6,7,5,5,8,
+		8,3,5,7,6,10,7,8,
+		7,8,8,6,7,7,8,11,
+		7,7,7,4,6,4,6,5,
+		4,6,6,5,6,6,5,6,
+		6,3,4,6,3,9,6,6,
+		6,6,5,5,6,6,6,9,
+		6,6,5,5,3,5,7,5,
+		7,7,7,6,8,5,9,7,
+		7,7,7,7,10,8,8,7,
+		7,6,7,7,9,7,8,7,
+		9,10,8,9,7,6,10,7,
+		6,6,6,5,6,6,9,6,
+		6,6,6,6,8,6,6,6,
+		5,6,4,4,4,6,7,2,
+		6,2,6,8,9,9,9,6,
+		7,7,7,6,8,5,9,7,
+		7,7,7,7,10,8,8,7,
+		7,6,7,7,9,7,8,7,
+		9,10,8,9,7,6,10,7,
+		6,5,9,6,9,6,6,6,
+		9,10,7,9,6,6,9,6,
+		5,6,9,6,9,6,6,6,
+		9,10,7,9,6,6,9,6};
+
+	static unsigned char font1k[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,10,8,
+		6,6,5,5,5,5,5,5,
+		2,3,6,10,6,13,9,3,
+		5,5,6,6,3,5,3,6,
+		6,6,6,6,6,6,6,6,
+		6,6,3,3,6,6,6,6,
+		10,7,7,6,7,5,5,8,
+		8,3,5,7,6,10,7,8,
+		7,8,8,6,7,7,8,11,
+		7,7,7,4,6,4,6,5,
+		4,6,6,5,6,6,5,6,
+		6,3,4,6,3,9,6,6,
+		6,6,5,5,6,6,6,9,
+		6,6,5,5,3,5,7,5,
+		6,5,3,9,5,6,5,5,
+		4,17,6,5,10,10,10,10,
+		10,3,3,5,5,4,4,6,
+		7,10,5,5,10,10,8,7,
+		2,3,6,5,8,7,3,6,
+		5,8,6,8,6,5,8,6,
+		5,6,4,6,4,6,7,2,
+		6,2,6,8,9,9,9,6,
+		9,6,6,6,6,6,9,5,
+		6,6,6,6,6,8,6,6,
+		6,6,6,5,9,6,9,6,
+		6,9,6,9,6,10,6,7,
+		10,7,7,8,8,5,9,6,
+		7,7,7,7,7,10,8,8,
+		7,7,7,6,7,7,9,7,
+		7,9,7,9,6,10,7,8};
+
+	static unsigned char font1m[] = {
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,10,8,6,6,
+		5,5,5,5,5,5,2,3,
+		6,10,6,13,9,3,5,5,
+		6,6,3,5,3,6,6,6,
+		6,6,6,6,6,6,6,6,
+		3,3,6,6,6,6,10,7,
+		7,6,7,5,5,8,8,3,
+		5,7,6,10,7,8,7,8,
+		8,6,7,7,8,11,7,7,
+		7,4,6,4,6,5,4,6,
+		6,5,6,6,5,6,6,3,
+		4,6,3,9,6,6,6,6,
+		5,5,6,6,6,9,6,6,
+		5,5,3,5,7,5,7,7,
+		7,6,8,5,9,7,7,7,
+		7,7,10,8,8,7,7,6,
+		7,7,9,7,8,7,9,10,
+		8,9,7,6,10,7,2,3,
+		6,7,8,7,3,6,5,8,
+		6,8,6,5,8,6,5,6,
+		4,4,4,6,7,2,6,2,
+		6,8,9,9,9,6,7,7,
+		7,6,8,5,9,7,7,7,
+		7,7,10,8,8,7,7,6,
+		7,7,9,7,8,7,9,10,
+		8,9,7,5,6,6,6,6,
+		6,5,6,6,9,6,6,6,
+		6,6,8,6,6,6,6,5,
+		9,6,9,6,6,6,9,10,
+		7,9,6,6,9,6,0,0,
+		5,5,5,5,5,5,5,5};
+
+	static unsigned char font1w[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,10,8,
+		6,6,5,5,5,5,5,5,
+		2,3,6,10,6,13,9,3,
+		5,5,6,6,3,5,3,6,
+		6,6,6,6,6,6,6,6,
+		6,6,3,3,6,6,6,6,
+		10,7,7,6,7,5,5,8,
+		8,3,5,7,6,10,7,8,
+		7,8,8,6,7,7,8,11,
+		7,7,7,4,6,4,6,5,
+		4,6,6,5,6,6,5,6,
+		6,3,4,6,3,9,6,6,
+		6,6,5,5,6,6,6,9,
+		6,6,5,5,3,5,7,5,
+		6,5,3,9,5,6,5,5,
+		4,17,6,5,10,10,10,10,
+		10,3,3,5,5,4,4,6,
+		7,10,5,5,10,10,8,7,
+		2,3,6,7,8,7,3,6,
+		5,8,6,8,6,5,8,6,
+		5,6,4,4,4,6,7,2,
+		6,2,6,8,9,9,9,6,
+		7,7,7,6,8,5,9,7,
+		7,7,7,7,10,8,8,7,
+		7,6,7,7,9,7,8,7,
+		9,10,8,9,7,6,10,7,
+		6,6,6,5,6,6,9,6,
+		6,6,6,6,8,6,6,6,
+		6,5,9,6,9,6,6,6,
+		9,10,7,9,6,6,9,6};
+
+	static unsigned char font2a[] = {
+		5,5,5,5,5,5,5,5,
+		5,4,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		4,2,4,9,6,11,8,2,
+		4,4,6,8,3,4,2,5,
+		7,7,7,7,7,7,7,7,
+		7,7,2,3,7,7,7,5,
+		11,9,6,7,7,6,6,8,
+		7,3,4,7,5,10,7,8,
+		6,8,6,5,6,7,7,11,
+		7,6,5,3,5,3,6,6,
+		3,6,7,6,7,7,4,7,
+		6,3,3,6,2,10,7,7,
+		7,7,4,5,4,7,6,10,
+		6,7,6,4,2,4,7,5,
+		9,8,7,6,8,6,10,7,
+		7,7,7,7,10,7,8,8,
+		6,7,6,6,8,7,8,7,
+		10,11,8,8,6,7,10,6,
+		6,7,7,5,8,7,11,6,
+		7,7,6,7,10,6,7,7,
+		5,6,5,4,3,6,6,2,
+		7,3,5,7,8,8,8,5,
+		9,8,7,6,8,6,10,7,
+		7,7,7,7,10,7,8,8,
+		6,7,6,6,8,7,8,7,
+		10,11,8,8,6,7,10,6,
+		7,6,6,7,8,6,8,8,
+		8,8,8,9,7,6,9,6,
+		6,7,6,7,8,6,8,8,
+		8,8,8,9,7,6,9,6};
+
+	static unsigned char font2k[] = {
+		5,5,5,5,5,5,5,5,
+		5,4,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		4,2,4,9,6,11,8,2,
+		4,4,6,8,3,4,2,5,
+		7,7,7,7,7,7,7,7,
+		7,7,2,3,7,7,7,5,
+		11,9,6,7,7,6,6,8,
+		7,3,4,7,5,10,7,8,
+		6,8,6,5,6,7,7,11,
+		7,6,5,3,5,3,6,6,
+		3,6,7,6,7,7,4,7,
+		6,3,3,6,2,10,7,7,
+		7,7,4,5,4,7,6,10,
+		6,7,6,4,2,4,7,5,
+		7,5,3,7,5,10,6,6,
+		4,13,5,4,9,10,10,10,
+		10,3,3,5,5,5,6,12,
+		7,11,5,4,12,10,8,8,
+		4,2,6,6,8,8,2,6,
+		6,10,5,7,7,4,10,4,
+		5,6,5,7,3,6,6,2,
+		7,3,5,7,8,8,8,5,
+		9,6,7,8,8,7,8,5,
+		6,7,7,6,7,10,6,7,
+		7,6,7,6,6,7,11,7,
+		7,9,6,8,6,8,8,8,
+		10,9,8,8,8,6,8,6,
+		7,7,7,7,7,10,7,8,
+		8,6,6,7,6,6,10,7,
+		6,8,7,10,7,11,7,8};
+
+	static unsigned char font2m[] = {
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,4,2,
+		4,9,6,11,8,2,4,4,
+		6,8,3,4,2,5,7,7,
+		7,7,7,7,7,7,7,7,
+		2,3,7,7,7,5,11,9,
+		6,7,7,6,6,8,7,3,
+		4,7,5,10,7,8,6,8,
+		6,5,6,7,7,11,7,6,
+		5,3,5,3,6,6,3,6,
+		7,6,7,7,4,7,6,3,
+		3,6,2,10,7,7,7,7,
+		4,5,4,7,6,10,6,7,
+		6,4,2,4,7,5,9,8,
+		7,6,8,6,10,7,7,7,
+		7,7,10,7,8,8,6,7,
+		6,6,8,7,8,7,10,11,
+		8,8,6,7,10,6,4,2,
+		6,6,8,8,2,6,6,10,
+		5,7,7,4,10,4,5,6,
+		5,4,3,6,6,2,7,3,
+		5,7,8,8,8,5,9,8,
+		7,6,8,6,10,7,7,7,
+		7,7,10,7,8,8,6,7,
+		6,6,8,7,8,7,10,11,
+		8,8,6,6,7,6,6,7,
+		7,5,8,7,11,6,7,7,
+		6,7,10,6,7,7,7,6,
+		6,7,8,6,8,8,8,8,
+		8,9,7,6,9,6,0,0,
+		5,5,5,11,10,10,10,11};
+
+	static unsigned char font2w[] = {
+		5,5,5,5,5,5,5,5,
+		5,4,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		4,2,4,9,6,11,8,2,
+		4,4,6,8,3,4,2,5,
+		7,7,7,7,7,7,7,7,
+		7,7,2,3,7,7,7,5,
+		11,9,6,7,7,6,6,8,
+		7,3,4,7,5,10,7,8,
+		6,8,6,5,6,7,7,11,
+		7,6,5,3,5,3,6,6,
+		3,6,7,6,7,7,4,7,
+		6,3,3,6,2,10,7,7,
+		7,7,4,5,4,7,6,10,
+		6,7,6,4,2,4,7,5,
+		7,5,3,7,5,10,6,6,
+		4,13,5,4,9,10,10,10,
+		10,3,3,5,5,5,6,12,
+		7,11,5,4,12,10,8,8,
+		4,2,6,6,8,8,2,6,
+		6,10,5,7,7,4,10,4,
+		5,6,5,4,3,6,6,2,
+		7,3,5,7,8,8,8,5,
+		9,8,7,6,8,6,10,7,
+		7,7,7,7,10,7,8,8,
+		6,7,6,6,8,7,8,7,
+		10,11,8,8,6,7,10,6,
+		6,7,7,5,8,7,11,6,
+		7,7,6,7,10,6,7,7,
+		7,6,6,7,8,6,8,8,
+		8,8,8,9,7,6,9,6};
+
+	static unsigned char font7a[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		2,3,6,8,7,11,9,3,
+		4,4,8,7,3,5,3,5,
+		6,6,6,6,6,6,6,6,
+		6,6,3,4,7,6,7,6,
+		10,9,7,7,7,6,6,7,
+		7,3,7,7,6,9,8,7,
+		7,8,7,7,7,7,8,10,
+		8,7,6,4,5,4,8,8,
+		4,6,6,6,6,6,5,6,
+		6,3,4,6,3,9,6,6,
+		6,6,5,6,5,6,7,9,
+		6,6,5,7,3,7,8,5,
+		9,7,7,6,9,6,11,6,
+		8,8,7,7,9,7,7,7,
+		7,7,7,7,11,8,8,7,
+		9,10,9,10,7,7,10,7,
+		6,6,6,6,7,6,9,6,
+		6,6,6,6,8,6,6,6,
+		5,7,4,4,4,7,8,3,
+		6,3,4,7,8,8,8,6,
+		9,7,7,6,9,6,11,6,
+		8,8,7,7,9,7,7,7,
+		7,7,7,7,11,8,8,7,
+		9,10,9,10,7,7,10,7,
+		6,6,7,6,8,6,6,6,
+		9,9,7,9,6,6,9,6,
+		6,6,7,6,8,6,6,6,
+		9,9,7,9,6,6,9,6};
+
+	static unsigned char font7k[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		2,3,6,8,7,11,9,3,
+		4,4,8,7,3,5,3,5,
+		6,6,6,6,6,6,6,6,
+		6,6,3,4,7,6,7,6,
+		10,9,7,7,7,6,6,7,
+		7,3,7,7,6,9,8,7,
+		7,8,7,7,7,7,8,10,
+		8,7,6,4,5,4,8,8,
+		4,6,6,6,6,6,5,6,
+		6,3,4,6,3,9,6,6,
+		6,6,5,6,5,6,7,9,
+		6,6,5,7,3,7,8,5,
+		6,5,3,7,6,9,6,6,
+		6,12,7,4,9,10,10,10,
+		10,3,3,6,6,8,7,9,
+		7,8,6,4,9,8,8,7,
+		1,3,6,6,8,7,2,5,
+		6,8,4,7,7,3,8,8,
+		5,7,4,6,4,7,8,3,
+		6,3,4,7,8,8,8,6,
+		9,6,6,6,7,6,8,6,
+		6,6,6,6,6,8,6,6,
+		6,6,6,6,7,6,9,6,
+		6,9,6,9,6,9,6,7,
+		10,9,7,8,9,6,11,6,
+		8,8,8,7,7,9,7,7,
+		7,7,7,7,7,7,11,7,
+		7,10,6,9,7,10,7,9};
+
+	static unsigned char font7m[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		2,3,6,8,7,11,9,3,
+		4,4,8,7,3,5,3,5,
+		6,6,6,6,6,6,6,6,
+		6,6,3,4,7,6,7,6,
+		10,9,7,7,7,6,6,7,
+		7,3,7,7,6,9,8,7,
+		7,8,7,7,7,7,8,10,
+		8,7,6,4,5,4,8,8,
+		4,6,6,6,6,6,5,6,
+		6,3,4,6,3,9,6,6,
+		6,6,5,6,5,6,7,9,
+		6,6,5,7,3,7,8,5,
+		9,7,7,6,9,6,11,6,
+		8,8,7,7,9,7,7,7,
+		7,7,7,7,11,8,8,7,
+		9,10,9,10,7,7,10,7,
+		1,3,6,7,8,7,2,5,
+		6,8,4,7,7,3,8,8,
+		5,7,4,4,4,7,8,3,
+		6,3,4,7,8,8,8,6,
+		9,7,7,6,9,6,11,6,
+		8,8,7,7,9,7,7,7,
+		7,7,7,7,11,8,8,7,
+		9,10,9,10,7,6,6,6,
+		6,6,6,6,7,6,9,6,
+		6,6,6,6,8,6,6,6,
+		6,6,7,6,8,6,6,6,
+		9,9,7,9,6,6,9,6};
+
+	static unsigned char font7w[] = {
+		5,5,5,5,5,5,5,5,
+		5,2,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,
+		2,3,6,8,7,11,9,3,
+		4,4,8,7,3,5,3,5,
+		6,6,6,6,6,6,6,6,
+		6,6,3,4,7,6,7,6,
+		10,9,7,7,7,6,6,7,
+		7,3,7,7,6,9,8,7,
+		7,8,7,7,7,7,8,10,
+		8,7,6,4,5,4,8,8,
+		4,6,6,6,6,6,5,6,
+		6,3,4,6,3,9,6,6,
+		6,6,5,6,5,6,7,9,
+		6,6,5,7,3,7,8,5,
+		6,5,3,7,6,9,6,6,
+		6,12,7,4,9,10,10,10,
+		10,3,3,6,6,8,7,9,
+		7,8,6,4,9,8,8,7,
+		1,3,6,7,8,7,2,5,
+		6,8,4,7,7,3,8,8,
+		5,7,4,4,4,7,8,3,
+		6,3,4,7,8,8,8,6,
+		9,7,7,6,9,6,11,6,
+		8,8,7,7,9,7,7,7,
+		7,7,7,7,11,8,8,7,
+		9,10,9,10,7,7,10,7,
+		6,6,6,6,7,6,9,6,
+		6,6,6,6,8,6,6,6,
+		6,6,7,6,8,6,6,6,
+		9,9,7,9,6,6,9,6};
+
+
 	memset(fntOW, 0, sizeof(fntOW));
 	memset(fntH, 0, sizeof(fntH));
 
@@ -817,6 +1362,30 @@
 			SetBuiltinFont(0, font0Hebrew, 0xe0, sizeof(font0Hebrew));
 			SetBuiltinFont(1, font1Hebrew, 0xe0, sizeof(font1Hebrew));
 			SetBuiltinFont(2, font2Hebrew, 0xe0, sizeof(font2Hebrew));
+			break;
+		case fontcp1251:
+			SetBuiltinFont(0, font0w, 0, sizeof(font0w));
+			SetBuiltinFont(1, font1w, 0, sizeof(font1w));
+			SetBuiltinFont(2, font2w, 0, sizeof(font2w));
+			SetBuiltinFont(7, font7w, 0, sizeof(font7w));
+			break;
+		case fontcp866:
+			SetBuiltinFont(0, font0a, 0, sizeof(font0a));
+			SetBuiltinFont(1, font1a, 0, sizeof(font1a));
+			SetBuiltinFont(2, font2a, 0, sizeof(font2a));
+			SetBuiltinFont(7, font7a, 0, sizeof(font7a));
+			break;
+		case fontkoi8_r:
+			SetBuiltinFont(0, font0k, 0, sizeof(font0k));
+			SetBuiltinFont(1, font1k, 0, sizeof(font1k));
+			SetBuiltinFont(2, font2k, 0, sizeof(font2k));
+			SetBuiltinFont(7, font7k, 0, sizeof(font7k));
+			break;
+		case fontmac:
+			SetBuiltinFont(0, font0m, 0, sizeof(font0m));
+			SetBuiltinFont(1, font1m, 0, sizeof(font1m));
+			SetBuiltinFont(2, font2m, 0, sizeof(font2m));
+			SetBuiltinFont(7, font7m, 0, sizeof(font7m));
 			break;
 		}
 
--- font.h.orig	Sat Mar  3 22:31:00 2001
+++ font.h	Sun Mar  4 00:48:08 2001
@@ -39,6 +39,10 @@
 #define fontChineseGB    4
 #define fontKoreanHanme  5
 #define fontKoreanHantip 6
+#define fontcp1251	 7
+#define fontcp866	 8
+#define fontkoi8_r	 9
+#define fontmac		10
 
 extern int  (*pfnChkCode)(unsigned char *cp, int *pdx);
 
--- main.c.orig	Sat Mar  3 22:25:18 2001
+++ main.c	Sun Mar  4 00:48:35 2001
@@ -61,6 +61,10 @@
         "        -Fg          Use GB Chinese font widths\n"
         "        -Fj          Use Japense font widths\n"
         "        -Fh          Use Hebrew font widths\n"
+        "        -Fcp1251     Use cp1251 font widths\n"
+        "        -Fcp866      Use cp866 font widths\n"
+        "        -Fkoi8-r     Use koi8-r font widths\n"
+        "        -Fmac        Use mac font widths\n"
         "        -rtl         Right to left support\n"
         "        -q           Less noisy output\n"
         "        -V           Generate M$ (VS-type) error/warning output\n"
@@ -221,6 +225,26 @@
     // font korean (jmjeong@oopsla.snu.ac.kr)
     if (FSzEqI(rgszArg[i], "-Fkt")) {
       fontType = fontKoreanHantip;
+      continue;
+    }
+			
+    if (FSzEqI(rgszArg[i], "-Fcp1251")) {
+      fontType = fontcp1251;
+      continue;
+    }
+			
+    if (FSzEqI(rgszArg[i], "-Fcp866")) {
+      fontType = fontcp866;
+      continue;
+    }
+			
+    if (FSzEqI(rgszArg[i], "-Fkoi8-r")) {
+      fontType = fontkoi8_r;
+      continue;
+    }
+			
+    if (FSzEqI(rgszArg[i], "-Fmac")) {
+      fontType = fontmac;
       continue;
     }