Update of /project/mcclim/cvsroot/mcclim/Experimental/freetype In directory common-lisp.net:/tmp/cvs-serv22084 Modified Files: freetype-fonts.lisp Log Message: Add keywords to the fonts -> filenames table Date: Tue Jun 14 02:07:56 2005 Author: bmastenbrook Index: mcclim/Experimental/freetype/freetype-fonts.lisp diff -u mcclim/Experimental/freetype/freetype-fonts.lisp:1.4 mcclim/Experimental/freetype/freetype-fonts.lisp:1.5 --- mcclim/Experimental/freetype/freetype-fonts.lisp:1.4 Fri Jun 10 15:58:31 2005 +++ mcclim/Experimental/freetype/freetype-fonts.lisp Tue Jun 14 02:07:56 2005 @@ -259,18 +259,18 @@ (defparameter *families/faces* '(((:fix :roman) . "VeraMono.ttf") ((:fix :italic) . "VeraMoIt.ttf") - ((:fix (:bold italic)) . "VeraMoBI.ttf") - ((:fix (:italic bold)) . "VeraMoBI.ttf") + ((:fix (:bold :italic)) . "VeraMoBI.ttf") + ((:fix (:italic :bold)) . "VeraMoBI.ttf") ((:fix :bold) . "VeraMoBd.ttf") ((:serif :roman) . "VeraSe.ttf") ((:serif :italic) . "VeraSe.ttf") - ((:serif (:bold italic)) . "VeraSeBd.ttf") - ((:serif (:italic bold)) . "VeraSeBd.ttf") + ((:serif (:bold :italic)) . "VeraSeBd.ttf") + ((:serif (:italic :bold)) . "VeraSeBd.ttf") ((:serif :bold) . "VeraSeBd.ttf") ((:sans-serif :roman) . "Vera.ttf") ((:sans-serif :italic) . "VeraIt.ttf") - ((:sans-serif (:bold italic)) . "VeraBI.ttf") - ((:sans-serif (:italic bold)) . "VeraBI.ttf") + ((:sans-serif (:bold :italic)) . "VeraBI.ttf") + ((:sans-serif (:italic :bold)) . "VeraBI.ttf") ((:sans-serif :bold) . "VeraBd.ttf"))) (defvar *freetype-font-path*) @@ -284,7 +284,7 @@ (cond (size (setf size (getf *sizes* size size)) (let* ((font-path-relative (cdr (assoc (list family face) *families/faces* - :test #'equal))) + :test #'equal))) (font-path (namestring (merge-pathnames font-path-relative *freetype-font-path*)))) (if (and font-path (probe-file font-path)) (make-free-type-face (slot-value port 'clim-clx::display)