Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
	basis/opengl/gl/extensions/extensions.factor
	basis/pango/cairo/cairo.factor

diff --cc basis/pango/cairo/cairo.factor
index 57896dd5b59fa58b2e0a912470412e4378c590ac,68a9f2f6df70b0d11ef5679deb79793bfc961733..b800fe7f49275c27ee2452f6c3a55a642f3f4123
--- 1/basis/pango/cairo/cairo.factor
--- 2/basis/pango/cairo/cairo.factor
+++ b/basis/pango/cairo/cairo.factor
@@@ -1,20 -1,71 +1,20 @@@
 -! Copyright (C) 2008 Matthew Willis.
 -! Copyright (C) 2009 Slava Pestov.
 +! Copyright (C) 2010 Anton Gorenko.
  ! See http://factorcode.org/license.txt for BSD license.
- USING: alien alien.c-types alien.libraries alien.syntax cairo.ffi
- combinators kernel system
 -!
 -! pangocairo bindings, from pango/pangocairo.h
 -USING: arrays sequences alien alien.c-types alien.data
 -alien.destructors alien.libraries alien.syntax math
 -math.functions math.vectors destructors combinators colors fonts
 -accessors assocs namespaces kernel pango pango.fonts
 -pango.layouts glib unicode.data images cache init system
 -math.rectangles fry memoize io.encodings.utf8 classes.struct
 -cairo cairo.ffi ;
 -IN: pango.cairo
++USING: alien alien.c-types alien.data alien.libraries
++alien.syntax cairo.ffi combinators kernel system
 +gir pango pango.ffi ;
  
 -<< {
 -    { [ os winnt? ] [ "pangocairo" "libpangocairo-1.0-0.dll" cdecl add-library ] }
 -    { [ os macosx? ] [ "pangocairo" "/opt/local/lib/libpangocairo-1.0.0.dylib" cdecl add-library ] }
 -    { [ os unix? ] [ ] }
 -} cond >>
 +<< 
 +"pango.cairo" {
 +    { [ os winnt? ] [ "libpangocairo-1.0-0.dll" cdecl add-library ] }
 +    { [ os macosx? ] [ "/opt/local/lib/libpangocairo-1.0.0.dylib" cdecl add-library ] }
 +    { [ os unix? ] [ "libpangocairo-1.0.so" cdecl add-library ] }
 +} cond 
 +>>
  
 -LIBRARY: pangocairo
 +IN-GIR: pango.cairo vocab:pango/cairo/PangoCairo-1.0.gir
  
 -C-TYPE: PangoCairoFontMap
 -C-TYPE: PangoCairoFont
 -
 -FUNCTION: PangoFontMap*
 -pango_cairo_font_map_new ( ) ;
 -
 -FUNCTION: PangoFontMap*
 -pango_cairo_font_map_new_for_font_type ( cairo_font_type_t fonttype ) ;
 -
 -FUNCTION: PangoFontMap*
 -pango_cairo_font_map_get_default ( ) ;
 -
 -FUNCTION: cairo_font_type_t
 -pango_cairo_font_map_get_font_type ( PangoCairoFontMap* fontmap ) ;
 -
 -FUNCTION: void
 -pango_cairo_font_map_set_resolution ( PangoCairoFontMap* fontmap, double dpi ) ;
 -
 -FUNCTION: double
 -pango_cairo_font_map_get_resolution ( PangoCairoFontMap* fontmap ) ;
 -
 -FUNCTION: PangoContext*
 -pango_cairo_font_map_create_context ( PangoCairoFontMap* fontmap ) ;
 -
 -FUNCTION: cairo_scaled_font_t*
 -pango_cairo_font_get_scaled_font ( PangoCairoFont* font ) ;
 -
 -! Update a Pango context for the current state of a cairo context
 -FUNCTION: void
 -pango_cairo_update_context ( cairo_t* cr, PangoContext* context ) ;
 -
 -FUNCTION: void
 -pango_cairo_context_set_font_options ( PangoContext* context, cairo_font_options_t* options ) ;
 -
 -FUNCTION: cairo_font_options_t*
 -pango_cairo_context_get_font_options ( PangoContext* context ) ;
 -
 -FUNCTION: void
 -pango_cairo_context_set_resolution ( PangoContext* context, double dpi ) ;
 -
 -FUNCTION: double
 -pango_cairo_context_get_resolution ( PangoContext* context ) ;
 -
 -! Convenience
 -FUNCTION: PangoLayout*
 -pango_cairo_create_layout ( cairo_t* cr ) ;
 +IN: pango.cairo.ffi
  
  FUNCTION: void
  pango_cairo_update_layout ( cairo_t* cr, PangoLayout* layout ) ;