From ahefner at common-lisp.net  Sun Jan 31 15:51:54 2010
From: ahefner at common-lisp.net (ahefner)
Date: Sun, 31 Jan 2010 10:51:54 -0500
Subject: [mcclim-cvs] CVS mcclim/Experimental/freetype
Message-ID: <E1Nbc5a-0000TO-GD@common-lisp.net>

Update of /project/mcclim/cvsroot/mcclim/Experimental/freetype
In directory cl-net:/tmp/cvs-serv1616/freetype

Modified Files:
	xrender-fonts.lisp 
Log Message:
Fall back to DejaVu instead of Vera, and fix serif italic filename.

It's not clear to me whether there used to be a serif oblique font which
has been superceded by the italic version, or whether the DejaVu filenames
have been broken since their inception and just were never fully tested.
Hopefully the latter.


--- /project/mcclim/cvsroot/mcclim/Experimental/freetype/xrender-fonts.lisp	2009/06/14 18:37:39	1.2
+++ /project/mcclim/cvsroot/mcclim/Experimental/freetype/xrender-fonts.lisp	2010/01/31 15:51:53	1.3
@@ -346,7 +346,7 @@
     ((:FIX (:ITALIC :BOLD)) . "DejaVuSansMono-BoldOblique.ttf") 
     ((:FIX :BOLD) . "DejaVuSansMono-Bold.ttf")
     ((:SERIF :ROMAN) . "DejaVuSerif.ttf") 
-    ((:SERIF :ITALIC) . "DejaVuSerif-Oblique.ttf")
+    ((:SERIF :ITALIC) . "DejaVuSerif-Italic.ttf")
     ((:SERIF (:BOLD :ITALIC)) . "DejaVuSerif-BoldOblique.ttf")
     ((:SERIF (:ITALIC :BOLD)) . "DejaVuSerif-BoldOblique.ttf") 
     ((:SERIF :BOLD) . "DejaVuSerif-Bold.ttf")
@@ -356,7 +356,7 @@
     ((:SANS-SERIF (:ITALIC :BOLD)) . "DejaVuSans-BoldOblique.ttf")
     ((:SANS-SERIF :BOLD) . "DejaVuSans-Bold.ttf")))
 
-(defvar *families/faces* *vera-families/faces*)
+(defparameter *families/faces* *dejavu-families/faces*)
 
 (defparameter *truetype-font-path* #p"/usr/share/fonts/truetype/ttf-dejavu/")