[cello-cvs] CVS cello/cl-ftgl

[ktilton]

Update of /project/cello/cvsroot/cello/cl-ftgl
In directory clnet:/tmp/cvs-serv31609/cl-ftgl

Modified Files:
	cl-ftgl.lisp 
Log Message:


--- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp	2006/08/28 21:45:24	1.12
+++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp	2006/09/05 18:43:56	1.13
@@ -20,7 +20,7 @@
 ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
 ;;; IN THE SOFTWARE.
 
-;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.12 2006/08/28 21:45:24 ktilton Exp $
+;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.13 2006/09/05 18:43:56 ktilton Exp $
 
 (eval-when (:compile-toplevel :load-toplevel)
   (pushnew :cl-ftgl *features*))
@@ -49,7 +49,8 @@
     #:*ftgl-dynamic-lib-path*
     #:*font-directory-path*
     #:*gui-style-default-face*
-    #:*gui-style-button-face*))
+    #:*gui-style-button-face*
+    #:*ftgl-ogl*))
 
 (in-package :cl-ftgl)
 
@@ -219,12 +220,12 @@
   (let* ((fspec (list type face size target-res depth))
          (match (cdr (assoc fspec *ftgl-fonts-loaded* :test 'equal))))
     #+shh (if match
-        (cells:trc "ftgl-font-ensure finds match" fspec (ftgl-ifont match))
-      (cells:trc "ftgl-font-ensure NO match"  fspec ))
+        (cells::trc "ftgl-font-ensure finds match" fspec (ftgl-ifont match))
+      (cells::trc "ftgl-font-ensure NO match"  fspec ))
     (or match
       (let ((f (apply 'ftgl-make fspec)))
         (push (cons fspec f) *ftgl-fonts-loaded*)
-        (cells:trc nil "ftgl-font-ensure new font spec ifont" fspec (ftgl-ifont f))
+        (cells::trc nil "ftgl-font-ensure new font spec ifont" fspec (ftgl-ifont f))
         f))))
 
 (defun ftgl-make (type face size target-res &optional (depth 0))
@@ -311,7 +312,7 @@
 (xftgl)
 
 (defun ftgl-get-ascender (font)
-  (cells:trc nil "ftgl-get-ascender" (ftgl-ifont font))
+  (cells::trc nil "ftgl-get-ascender" (ftgl-ifont font))
   (dbgftgl :ftgl-get-ascender
    (or (ftgl-ascender font)
      (setf (ftgl-ascender font)
@@ -379,7 +380,7 @@
   (dbgftgl :ftgl-render
    (when font
      (let ((df (ftgl-get-display-font font)))
-       (ukt:trc nil "ftgl-render ing" df s (ftgl-face font) (ftgl-size font))
+       (cells:trc nil "ftgl-render ing" df s (ftgl-face font) (ftgl-size font))
        (if df
            (fgc-render df s)
          (break "whoa, no display font for ~a" font))))))