Added binding to create font descriptions from strings

[clg] / pango / pango.lisp

diff --git a/pango/pango.lisp b/pango/pango.lisp
index c0f30fbc166c5ceee1770b4090fdcf9cc622b651..5833577f4b405fdc4b6828a4c441c82436193e30 100644 (file)
--- a/pango/pango.lisp
+++ b/pango/pango.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2001 Espen S. Johnsen <espen@users.sourceforge.org>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2001-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: pango.lisp,v 1.7 2005-02-03 23:09:06 espen Exp $
+;; $Id: pango.lisp,v 1.10 2006-04-10 18:39:31 espen Exp $
 
 (in-package "PANGO")
 
@@ -25,6 +30,14 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
                          "/libpango-1.0.so") :prefix "pango_")
   (init-types-in-library #.(concatenate 'string 
                          (pkg-config:pkg-variable "pango" "libdir")
-                         "/libpangoxft-1.0.so") :prefix "pango_xft"))
+                         "/libpangoxft-1.0.so") :prefix "pango_xft")
+  (init-types-in-library #.(concatenate 'string 
+                         (pkg-config:pkg-variable "pango" "libdir")
+                         "/libpangoft2-1.0.so") :prefix "pango_fc"))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (define-types-by-introspection "Pango"))
+
+(defbinding font-description-from-string () font-description
+  (desc string))
 
-(define-types-by-introspection "Pango")