[Tux4kids-commits] r90 - tuxtype/trunk/tuxtype

[holger at alioth.debian.org]

Author: holger
Date: 2006-02-06 21:19:33 +0000 (Mon, 06 Feb 2006)
New Revision: 90

Modified:
   tuxtype/trunk/tuxtype/globals.h
   tuxtype/trunk/tuxtype/loaders.c
Log:
- switch to ttf-gentium
- cleanup the hack in loaders.c - but it remains a debian-only hack :(



Modified: tuxtype/trunk/tuxtype/globals.h
===================================================================
--- tuxtype/trunk/tuxtype/globals.h	2006-02-06 21:14:25 UTC (rev 89)
+++ tuxtype/trunk/tuxtype/globals.h	2006-02-06 21:19:33 UTC (rev 90)
@@ -108,10 +108,10 @@
 #define amask 0xff000000
 #endif
 
-#define menu_font	"GenI102.ttf" /* "FreeSansBold.ttf" */   	/* was menu.ttf */
+#define menu_font	"GenAI101.ttf" /* or "DejaVuSans-Bold.ttf"  or "FreeSansBold.ttf" */ 	/* was menu.ttf */
 #define menu_font_size	20
 
-#define ttf_font	"GenI102.ttf" /*"FreeSansBold.ttf" */  	/* was letters.ttf */
+#define ttf_font	"GenAI101.ttf" /* or "DejaVuSans-Bold.ttf" or "FreeSansBold.ttf" */  	/* was letters.ttf */
 #define ttf_font_size	20
 
 #define MAX_NUM_WORDS   500

Modified: tuxtype/trunk/tuxtype/loaders.c
===================================================================
--- tuxtype/trunk/tuxtype/loaders.c	2006-02-06 21:14:25 UTC (rev 89)
+++ tuxtype/trunk/tuxtype/loaders.c	2006-02-06 21:19:33 UTC (rev 90)
@@ -187,31 +187,11 @@
 		}
 	}
 
-	/* this doesnt work yet (and is a hack)*/
-	/* cyrillic hack  */
-	 DEBUGCODE { printf(" sssssnichwaaassssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssuch mich a%sa  \n", themeName); }
-	  
-	if ( themeName == "greek" ) {
-	 DEBUGCODE { printf("1"); }
-			
-		sprintf( fn, "%s", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf" );
-		if ( checkFile(fn) ) {
-	 DEBUGCODE { printf("2"); }
 		
-			loadedFont = TTF_OpenFont( fn, 6 );
-	
-			if (loadedFont != NULL) {
-	 DEBUGCODE { printf(" jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjsssssssssssssssssuch mich %s  \n", themeName); }
-					return loadedFont;
-			}
-		}
-	} 
-	 DEBUGCODE { printf("warumbloss\n"); }
-		
 
-	/* this works (and is a hack */ 
-	/* "fallback" (the above _will_ fall): load the font from ttf-freefont */
-/*	sprintf( fn, "%s/%s", "/usr/share/fonts/truetype/freefont/", fontfile ); */
+	/* this works only on debian */ 
+	/* "fallback" (the above _will_ fall): load the font with fixed-path */
+	
 	sprintf( fn, "%s/%s", "/usr/share/fonts/truetype/ttf-gentium/", fontfile );
 	if ( checkFile(fn) ) {
 		/* try to load the font, if successful, return font*/