Import upstream version 1.9.2

author: Sebastian Dröge <sebastian.droege@collabora.co.uk> 2009-09-15 16:33:27 +0200
committer: Sebastian Dröge <sebastian.droege@collabora.co.uk> 2009-09-15 16:33:27 +0200
commit: 0e79096a3831c10cf9735a7f518bfb65d0632923 (patch)
tree: 40e397ecf2131c041bd6e308d5c351a36be113f6 /doc
parent: 23ad3f4fac1b4486013b7d4e7e0b8841625bfaaf (diff)
50 files changed, 1176 insertions, 450 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a4b66be..ff524ca 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/aclocal.gtk-doc.m4 \
 	$(top_srcdir)/build/aclocal.makefile.m4 \
 	$(top_srcdir)/build/aclocal.pkg.m4 \
+	$(top_srcdir)/build/aclocal.shave.m4 \
 	$(top_srcdir)/build/libtool.m4 \
 	$(top_srcdir)/build/ltoptions.m4 \
 	$(top_srcdir)/build/ltsugar.m4 \
@@ -54,10 +55,11 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/cairo-version.h \
 	$(top_srcdir)/build/configure.ac.version \
 	$(top_srcdir)/build/configure.ac.tools \
-	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.features \
 	$(top_srcdir)/build/configure.ac.warnings \
+	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.analysis \
+	$(top_srcdir)/build/configure.ac.noversion \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -81,20 +83,24 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BFD_LIBS = @BFD_LIBS@
 CAIROPERF_LIBS = @CAIROPERF_LIBS@
 CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LDFLAGS = @CAIRO_LDFLAGS@
 CAIRO_LIBS = @CAIRO_LIBS@
 CAIRO_LIBTOOL_VERSION_INFO = @CAIRO_LIBTOOL_VERSION_INFO@
 CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@
 CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@
 CAIRO_RELEASE_STATUS = @CAIRO_RELEASE_STATUS@
 CAIRO_REQUIRES = @CAIRO_REQUIRES@
+CAIRO_TEST_MODE = @CAIRO_TEST_MODE@
 CAIRO_TEST_UNDEFINED_LDFLAGS = @CAIRO_TEST_UNDEFINED_LDFLAGS@
 CAIRO_VERSION_MAJOR = @CAIRO_VERSION_MAJOR@
 CAIRO_VERSION_MICRO = @CAIRO_VERSION_MICRO@
@@ -121,6 +127,8 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FC = @FC@
 FGREP = @FGREP@
 FIND = @FIND@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
@@ -162,10 +170,12 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 LTP = @LTP@
 LTP_GENHTML = @LTP_GENHTML@
+MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -181,12 +191,14 @@ PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
+Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SHTOOL = @SHTOOL@
 STRIP = @STRIP@
+V = @V@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VERSION = @VERSION@
@@ -254,6 +266,7 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index 65ed2fb..cc95ce2 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -10,12 +10,13 @@ DOC_MAIN_SGML_FILE=cairo-docs.xml
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED" --ignore-decorators="cairo_public|cairo_private"
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../src
+# The directory containing the source code.
+DOC_SOURCE_DIR=$(top_srcdir)/src
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/src/cairo*.h
 CFILE_GLOB=$(top_srcdir)/src/cairo*.c
+EXTRA_HFILES=$(top_builddir)/src/cairo-supported-features.h
 
 # Headers to ignore
 IGNORE_HFILES= \
diff --git a/doc/public/Makefile.in b/doc/public/Makefile.in
index ced8a3c..8bfcbe6 100644
--- a/doc/public/Makefile.in
+++ b/doc/public/Makefile.in
@@ -154,25 +154,33 @@ check_PROGRAMS =
 @CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_50 = $(cairo_directfb_private)
 @CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_51 = $(cairo_directfb_sources)
 @CAIRO_HAS_DIRECTFB_SURFACE_TRUE@am__append_52 = cairo-directfb.pc
-@CAIRO_HAS_FT_FONT_TRUE@am__append_53 = $(cairo_ft_headers)
-@CAIRO_HAS_FT_FONT_TRUE@am__append_54 = $(cairo_ft_private)
-@CAIRO_HAS_FT_FONT_TRUE@am__append_55 = $(cairo_ft_sources)
-@CAIRO_HAS_FT_FONT_TRUE@am__append_56 = cairo-ft.pc
-@CAIRO_HAS_PS_SURFACE_TRUE@am__append_57 = $(cairo_ps_headers)
-@CAIRO_HAS_PS_SURFACE_TRUE@am__append_58 = $(cairo_ps_private)
-@CAIRO_HAS_PS_SURFACE_TRUE@am__append_59 = $(cairo_ps_sources)
-@CAIRO_HAS_PS_SURFACE_TRUE@am__append_60 = cairo-ps.pc
-@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_61 = $(cairo_pdf_headers)
-@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_62 = $(cairo_pdf_private)
-@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_63 = $(cairo_pdf_sources)
-@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_64 = cairo-pdf.pc
-@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_65 = $(cairo_svg_headers)
-@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_66 = $(cairo_svg_private)
-@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_67 = $(cairo_svg_sources)
-@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_68 = cairo-svg.pc
-@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_69 = $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers)
-@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_70 = $(cairo_test_surfaces_sources)
-@ENABLE_GTK_DOC_TRUE@am__append_71 = check-doc-coverage.sh
+@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_53 = $(cairo_script_headers)
+@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_54 = $(cairo_script_private)
+@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_55 = $(cairo_script_sources)
+@CAIRO_HAS_SCRIPT_SURFACE_TRUE@am__append_56 = cairo-script.pc
+@CAIRO_HAS_FT_FONT_TRUE@am__append_57 = $(cairo_ft_headers)
+@CAIRO_HAS_FT_FONT_TRUE@am__append_58 = $(cairo_ft_private)
+@CAIRO_HAS_FT_FONT_TRUE@am__append_59 = $(cairo_ft_sources)
+@CAIRO_HAS_FT_FONT_TRUE@am__append_60 = cairo-ft.pc
+@CAIRO_HAS_FC_FONT_TRUE@am__append_61 = $(cairo_fc_headers)
+@CAIRO_HAS_FC_FONT_TRUE@am__append_62 = $(cairo_fc_private)
+@CAIRO_HAS_FC_FONT_TRUE@am__append_63 = $(cairo_fc_sources)
+@CAIRO_HAS_FC_FONT_TRUE@am__append_64 = cairo-fc.pc
+@CAIRO_HAS_PS_SURFACE_TRUE@am__append_65 = $(cairo_ps_headers)
+@CAIRO_HAS_PS_SURFACE_TRUE@am__append_66 = $(cairo_ps_private)
+@CAIRO_HAS_PS_SURFACE_TRUE@am__append_67 = $(cairo_ps_sources)
+@CAIRO_HAS_PS_SURFACE_TRUE@am__append_68 = cairo-ps.pc
+@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_69 = $(cairo_pdf_headers)
+@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_70 = $(cairo_pdf_private)
+@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_71 = $(cairo_pdf_sources)
+@CAIRO_HAS_PDF_SURFACE_TRUE@am__append_72 = cairo-pdf.pc
+@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_73 = $(cairo_svg_headers)
+@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_74 = $(cairo_svg_private)
+@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_75 = $(cairo_svg_sources)
+@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_76 = cairo-svg.pc
+@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_77 = $(cairo_test_surfaces_private) $(cairo_test_surfaces_headers)
+@CAIRO_HAS_TEST_SURFACES_TRUE@am__append_78 = $(cairo_test_surfaces_sources)
+@ENABLE_GTK_DOC_TRUE@am__append_79 = check-doc-coverage.sh
 subdir = doc/public
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
@@ -183,6 +191,7 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/build/aclocal.gtk-doc.m4 \
 	$(top_srcdir)/build/aclocal.makefile.m4 \
 	$(top_srcdir)/build/aclocal.pkg.m4 \
+	$(top_srcdir)/build/aclocal.shave.m4 \
 	$(top_srcdir)/build/libtool.m4 \
 	$(top_srcdir)/build/ltoptions.m4 \
 	$(top_srcdir)/build/ltsugar.m4 \
@@ -191,10 +200,11 @@ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
 	$(top_srcdir)/cairo-version.h \
 	$(top_srcdir)/build/configure.ac.version \
 	$(top_srcdir)/build/configure.ac.tools \
-	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.features \
 	$(top_srcdir)/build/configure.ac.warnings \
+	$(top_srcdir)/build/configure.ac.system \
 	$(top_srcdir)/build/configure.ac.analysis \
+	$(top_srcdir)/build/configure.ac.noversion \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -206,20 +216,24 @@ DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BFD_LIBS = @BFD_LIBS@
 CAIROPERF_LIBS = @CAIROPERF_LIBS@
 CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LDFLAGS = @CAIRO_LDFLAGS@
 CAIRO_LIBS = @CAIRO_LIBS@
 CAIRO_LIBTOOL_VERSION_INFO = @CAIRO_LIBTOOL_VERSION_INFO@
 CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@
 CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@
 CAIRO_RELEASE_STATUS = @CAIRO_RELEASE_STATUS@
 CAIRO_REQUIRES = @CAIRO_REQUIRES@
+CAIRO_TEST_MODE = @CAIRO_TEST_MODE@
 CAIRO_TEST_UNDEFINED_LDFLAGS = @CAIRO_TEST_UNDEFINED_LDFLAGS@
 CAIRO_VERSION_MAJOR = @CAIRO_VERSION_MAJOR@
 CAIRO_VERSION_MICRO = @CAIRO_VERSION_MICRO@
@@ -246,6 +260,8 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FC = @FC@
 FGREP = @FGREP@
 FIND = @FIND@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
@@ -287,10 +303,12 @@ LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 LTP = @LTP@
 LTP_GENHTML = @LTP_GENHTML@
+MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJC = @OBJC@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -306,12 +324,14 @@ PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@
 PKG_CONFIG = @PKG_CONFIG@
 POPPLER_CFLAGS = @POPPLER_CFLAGS@
 POPPLER_LIBS = @POPPLER_LIBS@
+Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SHTOOL = @SHTOOL@
 STRIP = @STRIP@
+V = @V@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VERSION = @VERSION@
@@ -379,6 +399,7 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
@@ -401,22 +422,23 @@ EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
 	check-doc-coverage.sh check-doc-syntax.sh
 EXTRA_LTLIBRARIES = 
 MAINTAINERCLEANFILES = Makefile.in
-TESTS = $(am__append_71) check-doc-syntax.sh
+TESTS = $(am__append_79) check-doc-syntax.sh
 cairo_headers = cairo.h cairo-deprecated.h
 cairo_private = cairoint.h cairo-analysis-surface-private.h \
 	cairo-arc-private.h cairo-atomic-private.h \
 	cairo-cache-private.h cairo-clip-private.h \
-	cairo-compiler-private.h cairo-fixed-private.h \
-	cairo-fixed-type-private.h cairo-freelist-private.h \
-	cairo-gstate-private.h cairo-hash-private.h \
+	cairo-combsort-private.h cairo-compiler-private.h \
+	cairo-fixed-private.h cairo-fixed-type-private.h \
+	cairo-freelist-private.h cairo-gstate-private.h \
+	cairo-hash-private.h cairo-image-info-private.h \
 	cairo-malloc-private.h cairo-meta-surface-private.h \
 	cairo-mutex-impl-private.h cairo-mutex-list-private.h \
 	cairo-mutex-private.h cairo-mutex-type-private.h \
 	cairo-output-stream-private.h cairo-paginated-private.h \
 	cairo-paginated-surface-private.h cairo-path-fixed-private.h \
 	cairo-path-private.h cairo-private.h \
-	cairo-reference-count-private.h cairo-region-private.h \
-	cairo-scaled-font-private.h cairo-skiplist-private.h \
+	cairo-reference-count-private.h cairo-scaled-font-private.h \
+	cairo-skiplist-private.h cairo-spans-private.h \
 	cairo-surface-fallback-private.h cairo-surface-private.h \
 	cairo-types-private.h cairo-user-font-private.h \
 	cairo-wideint-private.h cairo-wideint-type-private.h $(NULL) \
@@ -427,18 +449,19 @@ cairo_sources = cairo-analysis-surface.c cairo-arc.c cairo-array.c \
 	cairo-fixed.c cairo-font-face.c cairo-font-face-twin.c \
 	cairo-font-face-twin-data.c cairo-font-options.c \
 	cairo-freelist.c cairo-gstate.c cairo-hash.c cairo-hull.c \
-	cairo-image-surface.c cairo-lzw.c cairo-matrix.c \
-	cairo-meta-surface.c cairo-misc.c cairo-mutex.c \
+	cairo-image-info.c cairo-image-surface.c cairo-lzw.c \
+	cairo-matrix.c cairo-meta-surface.c cairo-misc.c cairo-mutex.c \
 	cairo-output-stream.c cairo-paginated-surface.c \
 	cairo-path-bounds.c cairo-path.c cairo-path-fill.c \
-	cairo-path-fixed.c cairo-path-stroke.c cairo-pattern.c \
-	cairo-pen.c cairo-polygon.c cairo-rectangle.c cairo-region.c \
-	cairo-scaled-font.c cairo-skiplist.c cairo-slope.c \
-	cairo-spline.c cairo-stroke-style.c cairo-surface.c \
-	cairo-surface-fallback.c cairo-system.c cairo-traps.c \
-	cairo-unicode.c cairo-user-font.c cairo-version.c \
-	cairo-wideint.c $(NULL) $(_cairo_font_subset_sources) \
-	$(_cairo_pdf_operators_sources)
+	cairo-path-fixed.c cairo-path-in-fill.c cairo-path-stroke.c \
+	cairo-pattern.c cairo-pen.c cairo-polygon.c cairo-rectangle.c \
+	cairo-region.c cairo-scaled-font.c cairo-skiplist.c \
+	cairo-slope.c cairo-spans.c cairo-spline.c \
+	cairo-stroke-style.c cairo-surface.c cairo-surface-fallback.c \
+	cairo-tor-scan-converter.c cairo-system.c cairo-traps.c \
+	cairo-toy-font-face.c cairo-unicode.c cairo-user-font.c \
+	cairo-version.c cairo-wideint.c $(NULL) \
+	$(_cairo_font_subset_sources) $(_cairo_pdf_operators_sources)
 _cairo_font_subset_private = \
 	cairo-scaled-font-subsets-private.h \
 	cairo-truetype-subset-private.h \
@@ -474,12 +497,14 @@ cairo_ft_sources = cairo-ft-font.c
 # These are private, even though they look like public headers
 cairo_test_surfaces_private = \
 	test-fallback-surface.h \
+	test-fallback16-surface.h \
 	test-meta-surface.h \
 	test-paginated-surface.h \
 	$(NULL)
 
 cairo_test_surfaces_sources = \
 	test-fallback-surface.c \
+	test-fallback16-surface.c \
 	test-meta-surface.c \
 	test-paginated-surface.c \
 	$(NULL)
@@ -527,17 +552,19 @@ cairo_glitz_private = cairo-glitz-private.h
 cairo_glitz_sources = cairo-glitz-surface.c
 cairo_directfb_headers = cairo-directfb.h
 cairo_directfb_sources = cairo-directfb-surface.c
+cairo_script_headers = cairo-script.h
+cairo_script_sources = cairo-script-surface.c
 supported_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \
 	$(cairo_xlib_xrender_headers) $(cairo_quartz_headers) \
 	$(cairo_quartz_font_headers) $(cairo_win32_headers) \
 	$(cairo_win32_font_headers) $(cairo_png_headers) \
-	$(cairo_ft_headers) $(cairo_ps_headers) $(cairo_pdf_headers) \
-	$(cairo_svg_headers) $(cairo_image_headers) \
-	$(cairo_user_headers)
+	$(cairo_ft_headers) $(cairo_fc_headers) $(cairo_ps_headers) \
+	$(cairo_pdf_headers) $(cairo_svg_headers) \
+	$(cairo_image_headers) $(cairo_user_headers)
 unsupported_cairo_headers = $(cairo_xcb_headers) \
 	$(cairo_quartz_image_headers) $(cairo_os2_headers) \
 	$(cairo_beos_headers) $(cairo_glitz_headers) \
-	$(cairo_directfb_headers)
+	$(cairo_directfb_headers) $(cairo_script_headers)
 all_cairo_files = $(all_cairo_headers) $(all_cairo_private) $(all_cairo_sources)
 all_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \
 	$(cairo_xlib_xrender_headers) $(cairo_xcb_headers) \
@@ -546,7 +573,8 @@ all_cairo_headers = $(cairo_headers) $(cairo_xlib_headers) \
 	$(cairo_win32_font_headers) $(cairo_os2_headers) \
 	$(cairo_beos_headers) $(cairo_png_headers) \
 	$(cairo_glitz_headers) $(cairo_directfb_headers) \
-	$(cairo_ft_headers) $(cairo_ps_headers) $(cairo_pdf_headers) \
+	$(cairo_script_headers) $(cairo_ft_headers) \
+	$(cairo_fc_headers) $(cairo_ps_headers) $(cairo_pdf_headers) \
 	$(cairo_svg_headers) $(cairo_image_headers) \
 	$(cairo_user_headers)
 all_cairo_private = $(cairo_private) $(cairo_xlib_private) \
@@ -556,7 +584,8 @@ all_cairo_private = $(cairo_private) $(cairo_xlib_private) \
 	$(cairo_win32_font_private) $(cairo_os2_private) \
 	$(cairo_beos_private) $(cairo_png_private) \
 	$(cairo_glitz_private) $(cairo_directfb_private) \
-	$(cairo_ft_private) $(cairo_ps_private) $(cairo_pdf_private) \
+	$(cairo_script_private) $(cairo_ft_private) \
+	$(cairo_fc_private) $(cairo_ps_private) $(cairo_pdf_private) \
 	$(cairo_svg_private) $(cairo_test_surfaces_private) \
 	$(cairo_test_surfaces_headers) $(cairo_image_private) \
 	$(cairo_user_private)
@@ -567,7 +596,8 @@ all_cairo_sources = $(cairo_sources) $(cairo_xlib_sources) \
 	$(cairo_win32_font_sources) $(cairo_os2_sources) \
 	$(cairo_beos_sources) $(cairo_png_sources) \
 	$(cairo_glitz_sources) $(cairo_directfb_sources) \
-	$(cairo_ft_sources) $(cairo_ps_sources) $(cairo_pdf_sources) \
+	$(cairo_script_sources) $(cairo_ft_sources) \
+	$(cairo_fc_sources) $(cairo_ps_sources) $(cairo_pdf_sources) \
 	$(cairo_svg_sources) $(cairo_test_surfaces_sources) \
 	$(cairo_image_sources) $(cairo_user_sources)
 enabled_cairo_files = $(enabled_cairo_headers) $(enabled_cairo_private) $(enabled_cairo_sources)
@@ -577,35 +607,37 @@ enabled_cairo_headers = $(cairo_headers) $(am__append_1) \
 	$(am__append_29) $(am__append_33) $(am__append_37) \
 	$(am__append_41) $(am__append_45) $(am__append_49) \
 	$(am__append_53) $(am__append_57) $(am__append_61) \
-	$(am__append_65) $(cairo_image_headers) $(cairo_user_headers)
+	$(am__append_65) $(am__append_69) $(am__append_73) \
+	$(cairo_image_headers) $(cairo_user_headers)
 enabled_cairo_private = $(cairo_private) $(am__append_2) \
 	$(am__append_6) $(am__append_10) $(am__append_14) \
 	$(am__append_18) $(am__append_22) $(am__append_26) \
 	$(am__append_30) $(am__append_34) $(am__append_38) \
 	$(am__append_42) $(am__append_46) $(am__append_50) \
 	$(am__append_54) $(am__append_58) $(am__append_62) \
-	$(am__append_66) $(am__append_69) $(cairo_image_private) \
-	$(cairo_user_private)
+	$(am__append_66) $(am__append_70) $(am__append_74) \
+	$(am__append_77) $(cairo_image_private) $(cairo_user_private)
 enabled_cairo_sources = $(cairo_sources) $(am__append_3) \
 	$(am__append_7) $(am__append_11) $(am__append_15) \
 	$(am__append_19) $(am__append_23) $(am__append_27) \
 	$(am__append_31) $(am__append_35) $(am__append_39) \
 	$(am__append_43) $(am__append_47) $(am__append_51) \
 	$(am__append_55) $(am__append_59) $(am__append_63) \
-	$(am__append_67) $(am__append_70) $(cairo_image_sources) \
-	$(cairo_user_sources)
+	$(am__append_67) $(am__append_71) $(am__append_75) \
+	$(am__append_78) $(cairo_image_sources) $(cairo_user_sources)
 all_cairo_pkgconf = cairo.pc cairo-xlib.pc cairo-xlib-xrender.pc \
 	cairo-xcb.pc cairo-quartz.pc cairo-quartz-font.pc \
 	cairo-quartz-image.pc cairo-win32.pc cairo-win32-font.pc \
 	cairo-os2.pc cairo-beos.pc cairo-png.pc cairo-glitz.pc \
-	cairo-directfb.pc cairo-ft.pc cairo-ps.pc cairo-pdf.pc \
-	cairo-svg.pc
+	cairo-directfb.pc cairo-script.pc cairo-ft.pc cairo-fc.pc \
+	cairo-ps.pc cairo-pdf.pc cairo-svg.pc
 enabled_cairo_pkgconf = cairo.pc $(am__append_4) $(am__append_8) \
 	$(am__append_12) $(am__append_16) $(am__append_20) \
 	$(am__append_24) $(am__append_28) $(am__append_32) \
 	$(am__append_36) $(am__append_40) $(am__append_44) \
 	$(am__append_48) $(am__append_52) $(am__append_56) \
-	$(am__append_60) $(am__append_64) $(am__append_68)
+	$(am__append_60) $(am__append_64) $(am__append_68) \
+	$(am__append_72) $(am__append_76)
 
 # The name of the module.
 DOC_MODULE = cairo
@@ -616,12 +648,13 @@ DOC_MAIN_SGML_FILE = cairo-docs.xml
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="CAIRO_DISABLE_DEPRECATED" --ignore-decorators="cairo_public|cairo_private"
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR = ../../src
+# The directory containing the source code.
+DOC_SOURCE_DIR = $(top_srcdir)/src
 
 # Used for dependencies
 HFILE_GLOB = $(top_srcdir)/src/cairo*.h
 CFILE_GLOB = $(top_srcdir)/src/cairo*.c
+EXTRA_HFILES = $(top_builddir)/src/cairo-supported-features.h
 
 # Headers to ignore
 IGNORE_HFILES = \
@@ -651,9 +684,9 @@ HTML_IMAGES =
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS = 
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 
 # We set GPATH here; this gives us semantics for GNU make
 # which are more like other make's VPATH, when it comes to
@@ -960,18 +993,17 @@ version.xml: $(top_srcdir)/cairo-version.h
 
 @ENABLE_GTK_DOC_TRUE@doc: html-build.stamp
 @ENABLE_GTK_DOC_FALSE@doc:
-@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make doc"
+@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed (and --enable-gtk-doc) in order to make doc"
 @ENABLE_GTK_DOC_FALSE@	@false
 
 docs: html-build.stamp
 
 #### scan ####
 
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(EXTRA_HFILES)
 	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) --output-dir=$(srcdir)
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
@@ -1001,11 +1033,13 @@ tmpl/*.sgml:
 
 #### xml ####
 
+# gtkdoc-mkdb is broken and requires a --root-dir=$(srcdir) option
+# The _srcdir diversion is fragile but works for make check; make distcheck
 sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+	_srcdir="`pwd`/$(DOC_SOURCE_DIR)"; \
+	cd $(srcdir) && gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$$_srcdir --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -1062,7 +1096,7 @@ uninstall-local:
 #
 @ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
 @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed (and --enable-gtk-doc) in order to make dist"
 @ENABLE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc dist-hook-local
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index d3b7319..ff89db7 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -2,6 +2,7 @@
 <FILE>cairo-ft</FILE>
 <TITLE>ft-font</TITLE>
 CAIRO_HAS_FT_FONT
+CAIRO_HAS_FC_FONT
 cairo_ft_font_face_create_for_ft_face
 cairo_ft_font_face_create_for_pattern
 cairo_ft_font_options_substitute
@@ -71,6 +72,10 @@ cairo_image_surface_get_stride
 CAIRO_HAS_PDF_SURFACE
 cairo_pdf_surface_create
 cairo_pdf_surface_create_for_stream
+cairo_pdf_surface_restrict_to_version
+cairo_pdf_version_t
+cairo_pdf_get_versions
+cairo_pdf_version_to_string
 cairo_pdf_surface_set_size
 </SECTION>
 
@@ -168,6 +173,9 @@ cairo_svg_version_to_string
 <SECTION>
 <FILE>cairo-surface</FILE>
 <TITLE>surface</TITLE>
+CAIRO_MIME_TYPE_JP2
+CAIRO_MIME_TYPE_JPEG
+CAIRO_MIME_TYPE_PNG
 cairo_surface_t
 cairo_content_t
 cairo_surface_create_similar
@@ -192,6 +200,8 @@ cairo_surface_get_user_data
 cairo_surface_copy_page
 cairo_surface_show_page
 cairo_surface_has_show_text_glyphs
+cairo_surface_set_mime_data
+cairo_surface_get_mime_data
 </SECTION>
 
 <SECTION>
diff --git a/doc/public/html/cairo-context.html b/doc/public/html/cairo-context.html
index 09b8ca6..75daa78 100644
--- a/doc/public/html/cairo-context.html
+++ b/doc/public/html/cairo-context.html
@@ -233,9 +233,7 @@ maintain a separate reference to it.</p>
 <td> a newly allocated <a class="link" href="cairo-context.html#cairo-t" title="cairo_t"><span class="type">cairo_t</span></a> with a reference
  count of 1. The initial reference count should be released
  with <a class="link" href="cairo-context.html#cairo-destroy" title="cairo_destroy ()"><code class="function">cairo_destroy()</code></a> when you are done using the <a class="link" href="cairo-context.html#cairo-t" title="cairo_t"><span class="type">cairo_t</span></a>.
- This function never returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>. If memory cannot be
+ This function never returns <code class="literal">NULL</code>. If memory cannot be
  allocated, a special <a class="link" href="cairo-context.html#cairo-t" title="cairo_t"><span class="type">cairo_t</span></a> object will be returned on
  which <a class="link" href="cairo-context.html#cairo-status" title="cairo_status ()"><code class="function">cairo_status()</code></a> returns <a class="link" href="cairo-error-status.html#CAIRO-STATUS-NO-MEMORY--CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>.
  You can use this object normally, but no drawing will
@@ -915,7 +913,7 @@ Note that this option does not affect text rendering, instead see
 <a name="cairo-get-antialias"></a><h3>cairo_get_antialias ()</h3>
 <pre class="programlisting"><a class="link" href="cairo-context.html#cairo-antialias-t" title="enum cairo_antialias_t">cairo_antialias_t</a>   cairo_get_antialias                 (<a class="link" href="cairo-context.html#cairo-t" title="cairo_t">cairo_t</a> *cr);</pre>
 <p>
-Gets the current shape antialiasing mode, as set by <a class="link" href="cairo-context.html#cairo-set-antialias" title="cairo_set_antialias ()"><code class="function">cairo_set_antialias()</code></a>.</p>
+Gets the current shape antialiasing mode, as set by <code class="function">cairo_set_shape_antialias()</code>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1036,9 +1034,7 @@ See also <a class="link" href="cairo-context.html#cairo-set-dash" title="cairo_s
                                                          double *dashes,
                                                          double *offset);</pre>
 <p>
-Gets the current dash array.  If not <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, <em class="parameter"><code>dashes</code></em> should be big
+Gets the current dash array.  If not <code class="literal">NULL</code>, <em class="parameter"><code>dashes</code></em> should be big
 enough to hold at least the number of values returned by
 <a class="link" href="cairo-context.html#cairo-get-dash-count" title="cairo_get_dash_count ()"><code class="function">cairo_get_dash_count()</code></a>.</p>
 <p>
@@ -1053,16 +1049,12 @@ enough to hold at least the number of values returned by
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dashes</code></em> :</span></p></td>
-<td> return value for the dash array, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the dash array, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td>
-<td> return value for the current dash offset, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the current dash offset, or <code class="literal">NULL</code>
 </td>
 </tr>
 </tbody>
@@ -2006,9 +1998,7 @@ be dereferenced.</p>
 <pre class="programlisting"><a class="link" href="cairo-context.html#cairo-rectangle-list-t" title="cairo_rectangle_list_t">cairo_rectangle_list_t</a> * cairo_copy_clip_rectangle_list (<a class="link" href="cairo-context.html#cairo-t" title="cairo_t">cairo_t</a> *cr);</pre>
 <p>
 Gets the current clip region as a list of rectangles in user coordinates.
-Never returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.
+Never returns <code class="literal">NULL</code>.
 </p>
 <p>
 The status in the list may be <a class="link" href="cairo-error-status.html#CAIRO-STATUS-CLIP-NOT-REPRESENTABLE--CAPS"><code class="literal">CAIRO_STATUS_CLIP_NOT_REPRESENTABLE</code></a> to
@@ -2561,9 +2551,7 @@ object is a nil object, 0 will be returned.
                                                          <a class="link" href="cairo-types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()">cairo_destroy_func_t</a> destroy);</pre>
 <p>
 Attach user data to <em class="parameter"><code>cr</code></em>.  To remove user data from a surface,
-call this function with the key that was used to set it and <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+call this function with the key that was used to set it and <code class="literal">NULL</code>
 for <em class="parameter"><code>data</code></em>.</p>
 <p>
 </p>
@@ -2611,9 +2599,7 @@ slot could not be allocated for the user data.
 <p>
 Return user data previously attached to <em class="parameter"><code>cr</code></em> using the specified
 key.  If no user data has been attached with the given key this
-function returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.</p>
+function returns <code class="literal">NULL</code>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -2632,9 +2618,7 @@ attached to
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the user data previously attached or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.
+<td> the user data previously attached or <code class="literal">NULL</code>.
 
 </td>
 </tr>
diff --git a/doc/public/html/cairo-error-status.html b/doc/public/html/cairo-error-status.html
index ddf844f..34d5f96 100644
--- a/doc/public/html/cairo-error-status.html
+++ b/doc/public/html/cairo-error-status.html
@@ -75,6 +75,7 @@ code is required before or after each individual cairo function call.
 <a name="cairo-status-t"></a><h3>enum cairo_status_t</h3>
 <pre class="programlisting">typedef enum _cairo_status {
     CAIRO_STATUS_SUCCESS = 0,
+
     CAIRO_STATUS_NO_MEMORY,
     CAIRO_STATUS_INVALID_RESTORE,
     CAIRO_STATUS_INVALID_POP_GROUP,
@@ -105,8 +106,11 @@ code is required before or after each individual cairo function call.
     CAIRO_STATUS_NEGATIVE_COUNT,
     CAIRO_STATUS_INVALID_CLUSTERS,
     CAIRO_STATUS_INVALID_SLANT,
-    CAIRO_STATUS_INVALID_WEIGHT
-    /* after adding a new error: update CAIRO_STATUS_LAST_STATUS in cairoint.h */
+    CAIRO_STATUS_INVALID_WEIGHT,
+    CAIRO_STATUS_INVALID_SIZE,
+    CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED,
+
+    CAIRO_STATUS_LAST_STATUS
 } cairo_status_t;
 </pre>
 <p>
@@ -140,7 +144,7 @@ to get a human-readable representation of an error message.</p>
 </tr>
 <tr>
 <td><p><a name="CAIRO-STATUS-INVALID-POP-GROUP--CAPS"></a><span class="term"><code class="literal">CAIRO_STATUS_INVALID_POP_GROUP</code></span></p></td>
-<td> no saved group to pop
+<td> no saved group to pop, i.e. <a class="link" href="cairo-context.html#cairo-pop-group" title="cairo_pop_group ()"><code class="function">cairo_pop_group()</code></a> without matching <a class="link" href="cairo-context.html#cairo-push-group" title="cairo_push_group ()"><code class="function">cairo_push_group()</code></a>
 </td>
 </tr>
 <tr>
@@ -160,9 +164,7 @@ to get a human-readable representation of an error message.</p>
 </tr>
 <tr>
 <td><p><a name="CAIRO-STATUS-NULL-POINTER--CAPS"></a><span class="term"><code class="literal">CAIRO_STATUS_NULL_POINTER</code></span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> pointer
+<td> <code class="literal">NULL</code> pointer
 </td>
 </tr>
 <tr>
@@ -285,6 +287,24 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NUL
 <td> invalid value for an input <a class="link" href="cairo-text.html#cairo-font-weight-t" title="enum cairo_font_weight_t"><span class="type">cairo_font_weight_t</span></a> (Since 1.8)
 </td>
 </tr>
+<tr>
+<td><p><a name="CAIRO-STATUS-INVALID-SIZE--CAPS"></a><span class="term"><code class="literal">CAIRO_STATUS_INVALID_SIZE</code></span></p></td>
+<td> invalid value (typically too big) for the size of the input (surface, pattern, etc.) (Since 1.10)
+</td>
+</tr>
+<tr>
+<td><p><a name="CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"></a><span class="term"><code class="literal">CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</code></span></p></td>
+<td> user-font method not implemented (Since 1.10)
+</td>
+</tr>
+<tr>
+<td><p><a name="CAIRO-STATUS-LAST-STATUS--CAPS"></a><span class="term"><code class="literal">CAIRO_STATUS_LAST_STATUS</code></span></p></td>
+<td> this is a special value indicating the number of
+  status values defined in this enumeration.  When using this value, note
+  that the version of cairo at run-time may have additional status values
+  defined than the value of this symbol at compile-time. (Since 1.10)
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
diff --git a/doc/public/html/cairo-font-face.html b/doc/public/html/cairo-font-face.html
index 533a30c..e4b658c 100644
--- a/doc/public/html/cairo-font-face.html
+++ b/doc/public/html/cairo-font-face.html
@@ -122,9 +122,7 @@ The number of references to a <a class="link" href="cairo-font-face.html#cairo-f
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td>
-<td> a <a class="link" href="cairo-font-face.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a>, (may be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> in which case this
+<td> a <a class="link" href="cairo-font-face.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a>, (may be <code class="literal">NULL</code> in which case this
 function does nothing).
 </td>
 </tr>
@@ -322,9 +320,7 @@ object is a nil object, 0 will be returned.
                                                          <a class="link" href="cairo-types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()">cairo_destroy_func_t</a> destroy);</pre>
 <p>
 Attach user data to <em class="parameter"><code>font_face</code></em>.  To remove user data from a font face,
-call this function with the key that was used to set it and <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+call this function with the key that was used to set it and <code class="literal">NULL</code>
 for <em class="parameter"><code>data</code></em>.</p>
 <p>
 </p>
@@ -370,9 +366,7 @@ slot could not be allocated for the user data.
 <p>
 Return user data previously attached to <em class="parameter"><code>font_face</code></em> using the specified
 key.  If no user data has been attached with the given key this
-function returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.</p>
+function returns <code class="literal">NULL</code>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -391,9 +385,7 @@ attached to
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the user data previously attached or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.
+<td> the user data previously attached or <code class="literal">NULL</code>.
 </td>
 </tr>
 </tbody>
diff --git a/doc/public/html/cairo-font-options.html b/doc/public/html/cairo-font-options.html
index 443b2a6..c2a94c8 100644
--- a/doc/public/html/cairo-font-options.html
+++ b/doc/public/html/cairo-font-options.html
@@ -289,12 +289,8 @@ Compares two font options objects for equality.</p>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if all fields of the two font options objects match.
-Note that this function will return <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> if either object is in
+<td> <code class="literal">TRUE</code> if all fields of the two font options objects match.
+Note that this function will return <code class="literal">FALSE</code> if either object is in
 error.
 </td>
 </tr>
diff --git a/doc/public/html/cairo-ft-font.html b/doc/public/html/cairo-ft-font.html
index 65711b0..2d645f0 100644
--- a/doc/public/html/cairo-ft-font.html
+++ b/doc/public/html/cairo-ft-font.html
@@ -49,6 +49,7 @@
 <a name="cairo-ft-font.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">
 #define             <a class="link" href="cairo-ft-font.html#CAIRO-HAS-FT-FONT--CAPS" title="CAIRO_HAS_FT_FONT">CAIRO_HAS_FT_FONT</a>
+#define             <a class="link" href="cairo-ft-font.html#CAIRO-HAS-FC-FONT--CAPS" title="CAIRO_HAS_FC_FONT">CAIRO_HAS_FC_FONT</a>
 <a class="link" href="cairo-font-face.html#cairo-font-face-t" title="cairo_font_face_t">cairo_font_face_t</a> * <a class="link" href="cairo-ft-font.html#cairo-ft-font-face-create-for-ft-face" title="cairo_ft_font_face_create_for_ft_face ()">cairo_ft_font_face_create_for_ft_face</a>
                                                         (FT_Face face,
                                                          int load_flags);
@@ -79,6 +80,17 @@ This macro can be used to conditionally compile backend-specific code.
 </p>
 </div>
 <hr>
+<div class="refsect2" title="CAIRO_HAS_FC_FONT">
+<a name="CAIRO-HAS-FC-FONT--CAPS"></a><h3>CAIRO_HAS_FC_FONT</h3>
+<pre class="programlisting">#define CAIRO_HAS_FC_FONT 1
+</pre>
+<p>
+Defined if the Fontconfig-specific functions of the FreeType font backend
+are available.
+This macro can be used to conditionally compile backend-specific code.
+</p>
+</div>
+<hr>
 <div class="refsect2" title="cairo_ft_font_face_create_for_ft_face ()">
 <a name="cairo-ft-font-face-create-for-ft-face"></a><h3>cairo_ft_font_face_create_for_ft_face ()</h3>
 <pre class="programlisting"><a class="link" href="cairo-font-face.html#cairo-font-face-t" title="cairo_font_face_t">cairo_font_face_t</a> * cairo_ft_font_face_create_for_ft_face
@@ -172,8 +184,14 @@ appropriately to reflect the options in a <a class="link" href="cairo-font-optio
 <p>
 The pattern's FC_FT_FACE element is inspected first and if that is set,
 that will be the FreeType font face associated with the returned cairo
-font face.  Otherwise the FC_FILE and FC_INDEX elements of <em class="parameter"><code>pattern</code></em> are
-used to load a font face from file.
+font face.  Otherwise the FC_FILE element is checked.  If it's set,
+that and the value of the FC_INDEX element (defaults to zero) of <em class="parameter"><code>pattern</code></em>
+are used to load a font face from file.
+</p>
+<p>
+If both steps from the previous paragraph fails, <em class="parameter"><code>pattern</code></em> will be passed
+to FcConfigSubstitute, FcDefaultSubstitute, and finally FcFontMatch,
+and the resulting font pattern is used.
 </p>
 <p>
 If the FC_FT_FACE element of <em class="parameter"><code>pattern</code></em> is set, the user is responsible
@@ -188,13 +206,8 @@ the life time of the FT_Face to that of the cairo font-face.</p>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td>
-<td> A fully resolved fontconfig
-  pattern. A pattern can be resolved, by, among other things, calling
-  <code class="function">FcConfigSubstitute()</code>, <code class="function">FcDefaultSubstitute()</code>, then
-  <code class="function">FcFontMatch()</code>. Cairo will call <code class="function">FcPatternReference()</code> on this
-  pattern, so you should not further modify the pattern, but you can
-  release your reference to the pattern with <code class="function">FcPatternDestroy()</code> if
-  you no longer need to access it.
+<td> A fontconfig pattern.  Cairo makes a copy of the pattern
+if it needs to.  You are free to modify or free <em class="parameter"><code>pattern</code></em> after this call.
 </td>
 </tr>
 <tr>
@@ -255,7 +268,7 @@ You must be careful when using this function in a library or in a
 threaded application, because freetype's design makes it unsafe to
 call freetype functions simultaneously from multiple threads, (even
 if using distinct FT_Face objects). Because of this, application
-code that acquires an FT_Face object with this call must add it's
+code that acquires an FT_Face object with this call must add its
 own locking to protect any use of that object, (and which also must
 protect any other calls into cairo as almost any cairo function
 might result in a call into the freetype library).</p>
@@ -275,9 +288,7 @@ might result in a call into the freetype library).</p>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> The <span class="type">FT_Face</span> object for <em class="parameter"><code>font</code></em>, scaled appropriately,
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if <em class="parameter"><code>scaled_font</code></em> is in an error state (see
+or <code class="literal">NULL</code> if <em class="parameter"><code>scaled_font</code></em> is in an error state (see
 <a class="link" href="cairo-scaled-font.html#cairo-scaled-font-status" title="cairo_scaled_font_status ()"><code class="function">cairo_scaled_font_status()</code></a>) or there is insufficient memory.
 </td>
 </tr>
diff --git a/doc/public/html/cairo-image-surface.html b/doc/public/html/cairo-image-surface.html
index 32f9437..7e37f36 100644
--- a/doc/public/html/cairo-image-surface.html
+++ b/doc/public/html/cairo-image-surface.html
@@ -343,9 +343,7 @@ inspection or modification.</p>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a pointer to the image data of this surface or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a pointer to the image data of this surface or <code class="literal">NULL</code>
 if <em class="parameter"><code>surface</code></em> is not an image surface, or if <a class="link" href="cairo-surface.html#cairo-surface-finish" title="cairo_surface_finish ()"><code class="function">cairo_surface_finish()</code></a>
 has been called.
 
diff --git a/doc/public/html/cairo-matrix.html b/doc/public/html/cairo-matrix.html
index 4280e92..9904e3f 100644
--- a/doc/public/html/cairo-matrix.html
+++ b/doc/public/html/cairo-matrix.html
@@ -438,7 +438,7 @@ direction.
 <a name="cairo-matrix-invert"></a><h3>cairo_matrix_invert ()</h3>
 <pre class="programlisting"><a class="link" href="cairo-error-status.html#cairo-status-t" title="enum cairo_status_t">cairo_status_t</a>      cairo_matrix_invert                 (<a class="link" href="cairo-matrix.html#cairo-matrix-t" title="cairo_matrix_t">cairo_matrix_t</a> *matrix);</pre>
 <p>
-Changes <em class="parameter"><code>matrix</code></em> to be the inverse of it's original value. Not
+Changes <em class="parameter"><code>matrix</code></em> to be the inverse of its original value. Not
 all transformation matrices have inverses; if the matrix
 collapses points together (it is <em class="firstterm">degenerate</em>),
 then it has no inverse and this function will fail.</p>
diff --git a/doc/public/html/cairo-paths.html b/doc/public/html/cairo-paths.html
index 13d37f5..2727c16 100644
--- a/doc/public/html/cairo-paths.html
+++ b/doc/public/html/cairo-paths.html
@@ -316,9 +316,7 @@ over the returned data structure.
 </p>
 <p>
 This function will always return a valid pointer, but the result
-will have no data (<code class="literal">data==<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a></code> and
+will have no data (<code class="literal">data==<code class="literal">NULL</code></code> and
 <code class="literal">num_data==0</code>), if either of the following
 conditions hold:
 </p>
@@ -371,9 +369,7 @@ series of <a class="link" href="cairo-paths.html#CAIRO-PATH-LINE-TO--CAPS"><code
 </p>
 <p>
 This function will always return a valid pointer, but the result
-will have no data (<code class="literal">data==<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a></code> and
+will have no data (<code class="literal">data==<code class="literal">NULL</code></code> and
 <code class="literal">num_data==0</code>), if either of the following
 conditions hold:
 </p>
@@ -1043,9 +1039,7 @@ serious text-using applications. See <a class="link" href="cairo-paths.html#cair
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td>
-<td> a NUL-terminated string of text encoded in UTF-8, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a NUL-terminated string of text encoded in UTF-8, or <code class="literal">NULL</code>
 </td>
 </tr>
 </tbody>
diff --git a/doc/public/html/cairo-pattern.html b/doc/public/html/cairo-pattern.html
index f73bf95..16c7a28 100644
--- a/doc/public/html/cairo-pattern.html
+++ b/doc/public/html/cairo-pattern.html
@@ -324,9 +324,7 @@ pattern.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>count</code></em> :</span></p></td>
-<td> return value for the number of color stops, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the number of color stops, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -372,37 +370,27 @@ returned by <a class="link" href="cairo-pattern.html#cairo-pattern-get-color-sto
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td>
-<td> return value for the offset of the stop, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the offset of the stop, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td>
-<td> return value for red component of color, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for red component of color, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td>
-<td> return value for green component of color, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for green component of color, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td>
-<td> return value for blue component of color, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for blue component of color, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td>
-<td> return value for alpha component of color, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for alpha component of color, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -538,30 +526,22 @@ Gets the solid color for a solid color pattern.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td>
-<td> return value for red component of color, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for red component of color, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td>
-<td> return value for green component of color, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for green component of color, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td>
-<td> return value for blue component of color, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for blue component of color, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td>
-<td> return value for alpha component of color, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for alpha component of color, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -628,9 +608,7 @@ Gets the surface of a surface pattern.  The reference returned in
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td>
-<td> return value for surface of pattern, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for surface of pattern, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -725,30 +703,22 @@ Gets the gradient endpoints for a linear gradient.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td>
-<td> return value for the x coordinate of the first point, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the x coordinate of the first point, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td>
-<td> return value for the y coordinate of the first point, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the y coordinate of the first point, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td>
-<td> return value for the x coordinate of the second point, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the x coordinate of the second point, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td>
-<td> return value for the y coordinate of the second point, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the y coordinate of the second point, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -858,44 +828,32 @@ specified as a center coordinate and a radius.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td>
-<td> return value for the x coordinate of the center of the first circle, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the x coordinate of the center of the first circle, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td>
-<td> return value for the y coordinate of the center of the first circle, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the y coordinate of the center of the first circle, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>r0</code></em> :</span></p></td>
-<td> return value for the radius of the first circle, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the radius of the first circle, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td>
-<td> return value for the x coordinate of the center of the second circle, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the x coordinate of the center of the second circle, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td>
-<td> return value for the y coordinate of the center of the second circle, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the y coordinate of the center of the second circle, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>r1</code></em> :</span></p></td>
-<td> return value for the radius of the second circle, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> return value for the radius of the second circle, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -1432,9 +1390,7 @@ object is a nil object, 0 will be returned.
                                                          <a class="link" href="cairo-types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()">cairo_destroy_func_t</a> destroy);</pre>
 <p>
 Attach user data to <em class="parameter"><code>pattern</code></em>.  To remove user data from a surface,
-call this function with the key that was used to set it and <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+call this function with the key that was used to set it and <code class="literal">NULL</code>
 for <em class="parameter"><code>data</code></em>.</p>
 <p>
 </p>
@@ -1482,9 +1438,7 @@ slot could not be allocated for the user data.
 <p>
 Return user data previously attached to <em class="parameter"><code>pattern</code></em> using the
 specified key.  If no user data has been attached with the given
-key this function returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.</p>
+key this function returns <code class="literal">NULL</code>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1503,9 +1457,7 @@ attached to
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the user data previously attached or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.
+<td> the user data previously attached or <code class="literal">NULL</code>.
 
 </td>
 </tr>
diff --git a/doc/public/html/cairo-pdf-surface.html b/doc/public/html/cairo-pdf-surface.html
index d03e2db..681e620 100644
--- a/doc/public/html/cairo-pdf-surface.html
+++ b/doc/public/html/cairo-pdf-surface.html
@@ -56,6 +56,13 @@
                                                          void *closure,
                                                          double width_in_points,
                                                          double height_in_points);
+void                <a class="link" href="cairo-pdf-surface.html#cairo-pdf-surface-restrict-to-version" title="cairo_pdf_surface_restrict_to_version ()">cairo_pdf_surface_restrict_to_version</a>
+                                                        (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
+                                                         <a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t">cairo_pdf_version_t</a> version);
+enum                <a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t">cairo_pdf_version_t</a>;
+void                <a class="link" href="cairo-pdf-surface.html#cairo-pdf-get-versions" title="cairo_pdf_get_versions ()">cairo_pdf_get_versions</a>              (<a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t">cairo_pdf_version_t</a> const **versions,
+                                                         int *num_versions);
+const char *        <a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-to-string" title="cairo_pdf_version_to_string ()">cairo_pdf_version_to_string</a>         (<a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t">cairo_pdf_version_t</a> version);
 void                <a class="link" href="cairo-pdf-surface.html#cairo-pdf-surface-set-size" title="cairo_pdf_surface_set_size ()">cairo_pdf_surface_set_size</a>          (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
                                                          double width_in_points,
                                                          double height_in_points);
@@ -95,9 +102,7 @@ to <em class="parameter"><code>filename</code></em>.</p>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td> a filename for the PDF output (must be writable), <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> may be
+<td> a filename for the PDF output (must be writable), <code class="literal">NULL</code> may be
            used to specify no output. This will generate a PDF surface that
            may be queried and used as a source, without generating a
            temporary file.
@@ -146,9 +151,7 @@ incrementally to the stream represented by <em class="parameter"><code>write_fun
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td>
-<td> a <a class="link" href="cairo-png-functions.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a <a class="link" href="cairo-png-functions.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <code class="literal">NULL</code>
              to indicate a no-op <em class="parameter"><code>write_func</code></em>. With a no-op <em class="parameter"><code>write_func</code></em>,
              the surface may be queried or used as a source without
              generating any temporary files.
@@ -186,6 +189,127 @@ occurs. You can use <a class="link" href="cairo-surface.html#cairo-surface-statu
 <p class="since">Since 1.2</p>
 </div>
 <hr>
+<div class="refsect2" title="cairo_pdf_surface_restrict_to_version ()">
+<a name="cairo-pdf-surface-restrict-to-version"></a><h3>cairo_pdf_surface_restrict_to_version ()</h3>
+<pre class="programlisting">void                cairo_pdf_surface_restrict_to_version
+                                                        (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
+                                                         <a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t">cairo_pdf_version_t</a> version);</pre>
+<p>
+Restricts the generated PDF file to <em class="parameter"><code>version</code></em>. See <a class="link" href="cairo-pdf-surface.html#cairo-pdf-get-versions" title="cairo_pdf_get_versions ()"><code class="function">cairo_pdf_get_versions()</code></a>
+for a list of available version values that can be used here.
+</p>
+<p>
+This function should only be called before any drawing operations
+have been performed on the given surface. The simplest way to do
+this is to call this function immediately after creating the
+surface.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td>
+<td> a PDF <a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>version</code></em> :</span></p></td>
+<td> PDF version
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 1.10</p>
+</div>
+<hr>
+<div class="refsect2" title="enum cairo_pdf_version_t">
+<a name="cairo-pdf-version-t"></a><h3>enum cairo_pdf_version_t</h3>
+<pre class="programlisting">typedef enum _cairo_pdf_version {
+    CAIRO_PDF_VERSION_1_4,
+    CAIRO_PDF_VERSION_1_5
+} cairo_pdf_version_t;
+</pre>
+<p>
+<a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t"><span class="type">cairo_pdf_version_t</span></a> is used to describe the version number of the PDF
+specification that a generated PDF file will conform to.
+</p>
+<p>
+Since 1.10</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><a name="CAIRO-PDF-VERSION-1-4--CAPS"></a><span class="term"><code class="literal">CAIRO_PDF_VERSION_1_4</code></span></p></td>
+<td> The version 1.4 of the PDF specification.
+</td>
+</tr>
+<tr>
+<td><p><a name="CAIRO-PDF-VERSION-1-5--CAPS"></a><span class="term"><code class="literal">CAIRO_PDF_VERSION_1_5</code></span></p></td>
+<td> The version 1.5 of the PDF specification.
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2" title="cairo_pdf_get_versions ()">
+<a name="cairo-pdf-get-versions"></a><h3>cairo_pdf_get_versions ()</h3>
+<pre class="programlisting">void                cairo_pdf_get_versions              (<a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t">cairo_pdf_version_t</a> const **versions,
+                                                         int *num_versions);</pre>
+<p>
+Used to retrieve the list of supported versions. See
+<a class="link" href="cairo-pdf-surface.html#cairo-pdf-surface-restrict-to-version" title="cairo_pdf_surface_restrict_to_version ()"><code class="function">cairo_pdf_surface_restrict_to_version()</code></a>.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>versions</code></em> :</span></p></td>
+<td> supported version list
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>num_versions</code></em> :</span></p></td>
+<td> list length
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 1.10</p>
+</div>
+<hr>
+<div class="refsect2" title="cairo_pdf_version_to_string ()">
+<a name="cairo-pdf-version-to-string"></a><h3>cairo_pdf_version_to_string ()</h3>
+<pre class="programlisting">const char *        cairo_pdf_version_to_string         (<a class="link" href="cairo-pdf-surface.html#cairo-pdf-version-t" title="enum cairo_pdf_version_t">cairo_pdf_version_t</a> version);</pre>
+<p>
+Get the string representation of the given <em class="parameter"><code>version</code></em> id. This function
+will return <code class="literal">NULL</code> if <em class="parameter"><code>version</code></em> isn't valid. See <a class="link" href="cairo-pdf-surface.html#cairo-pdf-get-versions" title="cairo_pdf_get_versions ()"><code class="function">cairo_pdf_get_versions()</code></a>
+for a way to get the list of valid version ids.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>version</code></em> :</span></p></td>
+<td> a version id
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the string associated to given version.
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 1.10</p>
+</div>
+<hr>
 <div class="refsect2" title="cairo_pdf_surface_set_size ()">
 <a name="cairo-pdf-surface-set-size"></a><h3>cairo_pdf_surface_set_size ()</h3>
 <pre class="programlisting">void                cairo_pdf_surface_set_size          (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
diff --git a/doc/public/html/cairo-ps-surface.html b/doc/public/html/cairo-ps-surface.html
index ae48346..e3af8a9 100644
--- a/doc/public/html/cairo-ps-surface.html
+++ b/doc/public/html/cairo-ps-surface.html
@@ -115,9 +115,7 @@ vary. See <a class="link" href="cairo-ps-surface.html#cairo-ps-surface-set-size"
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td> a filename for the PS output (must be writable), <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> may be
+<td> a filename for the PS output (must be writable), <code class="literal">NULL</code> may be
            used to specify no output. This will generate a PS surface that
            may be queried and used as a source, without generating a
            temporary file.
@@ -172,9 +170,7 @@ output can vary. See <a class="link" href="cairo-ps-surface.html#cairo-ps-surfac
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td>
-<td> a <a class="link" href="cairo-png-functions.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a <a class="link" href="cairo-png-functions.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <code class="literal">NULL</code>
              to indicate a no-op <em class="parameter"><code>write_func</code></em>. With a no-op <em class="parameter"><code>write_func</code></em>,
              the surface may be queried or used as a source without
              generating any temporary files.
@@ -308,9 +304,7 @@ Used to retrieve the list of supported levels. See
 <pre class="programlisting">const char *        cairo_ps_level_to_string            (<a class="link" href="cairo-ps-surface.html#cairo-ps-level-t" title="enum cairo_ps_level_t">cairo_ps_level_t</a> level);</pre>
 <p>
 Get the string representation of the given <em class="parameter"><code>level</code></em> id. This function
-will return <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if <em class="parameter"><code>level</code></em> id isn't valid. See <a class="link" href="cairo-ps-surface.html#cairo-ps-get-levels" title="cairo_ps_get_levels ()"><code class="function">cairo_ps_get_levels()</code></a>
+will return <code class="literal">NULL</code> if <em class="parameter"><code>level</code></em> id isn't valid. See <a class="link" href="cairo-ps-surface.html#cairo-ps-get-levels" title="cairo_ps_get_levels ()"><code class="function">cairo_ps_get_levels()</code></a>
 for a way to get the list of valid level ids.</p>
 <p>
 </p>
@@ -338,9 +332,7 @@ for a way to get the list of valid level ids.</p>
 <pre class="programlisting">void                cairo_ps_surface_set_eps            (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
                                                          <a class="link" href="cairo-types.html#cairo-bool-t" title="cairo_bool_t">cairo_bool_t</a> eps);</pre>
 <p>
-If <em class="parameter"><code>eps</code></em> is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a>, the PostScript surface will output Encapsulated
+If <em class="parameter"><code>eps</code></em> is <code class="literal">TRUE</code>, the PostScript surface will output Encapsulated
 PostScript.
 </p>
 <p>
@@ -361,9 +353,7 @@ than one page.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>eps</code></em> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> to output EPS format PostScript
+<td> <code class="literal">TRUE</code> to output EPS format PostScript
 </td>
 </tr>
 </tbody>
@@ -388,9 +378,7 @@ Check whether the PostScript surface will output Encapsulated PostScript.</p>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the surface will output Encapsulated PostScript.
+<td> <code class="literal">TRUE</code> if the surface will output Encapsulated PostScript.
 
 </td>
 </tr>
diff --git a/doc/public/html/cairo-quartz-font.html b/doc/public/html/cairo-quartz-font.html
index 343c1f6..667e2cc 100644
--- a/doc/public/html/cairo-quartz-font.html
+++ b/doc/public/html/cairo-quartz-font.html
@@ -67,7 +67,8 @@ implementation of the font backend methods.
 <a name="cairo-quartz-font.details"></a><h2>Details</h2>
 <div class="refsect2" title="CAIRO_HAS_QUARTZ_FONT">
 <a name="CAIRO-HAS-QUARTZ-FONT--CAPS"></a><h3>CAIRO_HAS_QUARTZ_FONT</h3>
-<pre class="programlisting">#define             CAIRO_HAS_QUARTZ_FONT</pre>
+<pre class="programlisting">#define CAIRO_HAS_QUARTZ_FONT 1
+</pre>
 <p>
 Defined if the Quartz font backend is available.
 This macro can be used to conditionally compile backend-specific code.
diff --git a/doc/public/html/cairo-quartz-surface.html b/doc/public/html/cairo-quartz-surface.html
index 850b79a..0d56889 100644
--- a/doc/public/html/cairo-quartz-surface.html
+++ b/doc/public/html/cairo-quartz-surface.html
@@ -70,7 +70,8 @@ Apple OS X Quartz rendering system.
 <a name="cairo-quartz-surface.details"></a><h2>Details</h2>
 <div class="refsect2" title="CAIRO_HAS_QUARTZ_SURFACE">
 <a name="CAIRO-HAS-QUARTZ-SURFACE--CAPS"></a><h3>CAIRO_HAS_QUARTZ_SURFACE</h3>
-<pre class="programlisting">#define             CAIRO_HAS_QUARTZ_SURFACE</pre>
+<pre class="programlisting">#define CAIRO_HAS_QUARTZ_SURFACE 1
+</pre>
 <p>
 Defined if the Quartz surface backend is available.
 This macro can be used to conditionally compile backend-specific code.
diff --git a/doc/public/html/cairo-scaled-font.html b/doc/public/html/cairo-scaled-font.html
index 508d0ea..a26f048 100644
--- a/doc/public/html/cairo-scaled-font.html
+++ b/doc/public/html/cairo-scaled-font.html
@@ -197,9 +197,7 @@ The number of references to a <a class="link" href="cairo-scaled-font.html#cairo
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td>
-<td> a <a class="link" href="cairo-scaled-font.html#cairo-scaled-font-t" title="cairo_scaled_font_t"><span class="type">cairo_scaled_font_t</span></a>, (may be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> in which case
+<td> a <a class="link" href="cairo-scaled-font.html#cairo-scaled-font-t" title="cairo_scaled_font_t"><span class="type">cairo_scaled_font_t</span></a>, (may be <code class="literal">NULL</code> in which case
 this function does nothing)
 </td>
 </tr>
@@ -538,9 +536,7 @@ Converts UTF-8 text to an array of glyphs, optionally with cluster
 mapping, that can be used to render later using <em class="parameter"><code>scaled_font</code></em>.
 </p>
 <p>
-If <em class="parameter"><code>glyphs</code></em> initially points to a non-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> value, that array is used
+If <em class="parameter"><code>glyphs</code></em> initially points to a non-<code class="literal">NULL</code> value, that array is used
 as a glyph buffer, and <em class="parameter"><code>num_glyphs</code></em> should point to the number of glyph
 entries available there.  If the provided glyph array is too short for
 the conversion, a new glyph array is allocated using <a class="link" href="cairo-text.html#cairo-glyph-allocate" title="cairo_glyph_allocate ()"><code class="function">cairo_glyph_allocate()</code></a>
@@ -551,17 +547,11 @@ array using <a class="link" href="cairo-text.html#cairo-glyph-free" title="cairo
 array was large enough.
 </p>
 <p>
-If <em class="parameter"><code>clusters</code></em> is not <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, <em class="parameter"><code>num_clusters</code></em> and <em class="parameter"><code>cluster_flags</code></em> should not be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>,
+If <em class="parameter"><code>clusters</code></em> is not <code class="literal">NULL</code>, <em class="parameter"><code>num_clusters</code></em> and <em class="parameter"><code>cluster_flags</code></em> should not be <code class="literal">NULL</code>,
 and cluster mapping will be computed.
 The semantics of how cluster array allocation works is similar to the glyph
 array.  That is,
-if <em class="parameter"><code>clusters</code></em> initially points to a non-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> value, that array is used
+if <em class="parameter"><code>clusters</code></em> initially points to a non-<code class="literal">NULL</code> value, that array is used
 as a cluster buffer, and <em class="parameter"><code>num_clusters</code></em> should point to the number of cluster
 entries available there.  If the provided cluster array is too short for
 the conversion, a new cluster array is allocated using <a class="link" href="cairo-text.html#cairo-text-cluster-allocate" title="cairo_text_cluster_allocate ()"><code class="function">cairo_text_cluster_allocate()</code></a>
@@ -572,9 +562,7 @@ array using <a class="link" href="cairo-text.html#cairo-text-cluster-free" title
 array was large enough.
 </p>
 <p>
-In the simplest case, <em class="parameter"><code>glyphs</code></em> and <em class="parameter"><code>clusters</code></em> can point to <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> initially
+In the simplest case, <em class="parameter"><code>glyphs</code></em> and <em class="parameter"><code>clusters</code></em> can point to <code class="literal">NULL</code> initially
 and a suitable array will be allocated.  In code:
 </p>
 <div class="informalexample"><pre class="programlisting">
@@ -712,24 +700,18 @@ same <em class="parameter"><code>scaled_font</code></em> is used for the operati
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>clusters</code></em> :</span></p></td>
-<td> pointer to array of cluster mapping information to fill, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> pointer to array of cluster mapping information to fill, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>num_clusters</code></em> :</span></p></td>
-<td> pointer to number of clusters, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> pointer to number of clusters, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cluster_flags</code></em> :</span></p></td>
 <td> pointer to location to store cluster flags corresponding to the
-                output <em class="parameter"><code>clusters</code></em>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+                output <em class="parameter"><code>clusters</code></em>, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -750,7 +732,9 @@ set on <em class="parameter"><code>scaled_font</code></em>.
 <a name="cairo-scaled-font-get-font-face"></a><h3>cairo_scaled_font_get_font_face ()</h3>
 <pre class="programlisting"><a class="link" href="cairo-font-face.html#cairo-font-face-t" title="cairo_font_face_t">cairo_font_face_t</a> * cairo_scaled_font_get_font_face     (<a class="link" href="cairo-scaled-font.html#cairo-scaled-font-t" title="cairo_scaled_font_t">cairo_scaled_font_t</a> *scaled_font);</pre>
 <p>
-Gets the font face that this scaled font was created for.</p>
+Gets the font face that this scaled font uses.  This is the
+font face passed to <a class="link" href="cairo-scaled-font.html#cairo-scaled-font-create" title="cairo_scaled_font_create ()"><code class="function">cairo_scaled_font_create()</code></a> if that font face
+was not of type <a class="link" href="cairo-font-face.html#CAIRO-FONT-TYPE-TOY--CAPS"><code class="literal">CAIRO_FONT_TYPE_TOY</code></a>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -832,7 +816,10 @@ Stores the font matrix with which <em class="parameter"><code>scaled_font</code>
 <pre class="programlisting">void                cairo_scaled_font_get_ctm           (<a class="link" href="cairo-scaled-font.html#cairo-scaled-font-t" title="cairo_scaled_font_t">cairo_scaled_font_t</a> *scaled_font,
                                                          <a class="link" href="cairo-matrix.html#cairo-matrix-t" title="cairo_matrix_t">cairo_matrix_t</a> *ctm);</pre>
 <p>
-Stores the CTM with which <em class="parameter"><code>scaled_font</code></em> was created into <em class="parameter"><code>ctm</code></em>.</p>
+Stores the CTM with which <em class="parameter"><code>scaled_font</code></em> was created into <em class="parameter"><code>ctm</code></em>.
+Note that the translation offsets (x0, y0) of the CTM are ignored
+by <a class="link" href="cairo-scaled-font.html#cairo-scaled-font-create" title="cairo_scaled_font_create ()"><code class="function">cairo_scaled_font_create()</code></a>.  So, the matrix this
+function returns always has 0,0 as x0,y0.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -887,7 +874,8 @@ font space to device space.</p>
 <pre class="programlisting"><a class="link" href="cairo-font-face.html#cairo-font-type-t" title="enum cairo_font_type_t">cairo_font_type_t</a>   cairo_scaled_font_get_type          (<a class="link" href="cairo-scaled-font.html#cairo-scaled-font-t" title="cairo_scaled_font_t">cairo_scaled_font_t</a> *scaled_font);</pre>
 <p>
 This function returns the type of the backend used to create
-a scaled font. See <a class="link" href="cairo-font-face.html#cairo-font-type-t" title="enum cairo_font_type_t"><span class="type">cairo_font_type_t</span></a> for available types.</p>
+a scaled font. See <a class="link" href="cairo-font-face.html#cairo-font-type-t" title="enum cairo_font_type_t"><span class="type">cairo_font_type_t</span></a> for available types.
+However, this function never returns <a class="link" href="cairo-font-face.html#CAIRO-FONT-TYPE-TOY--CAPS"><code class="literal">CAIRO_FONT_TYPE_TOY</code></a>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -945,9 +933,7 @@ object is a nil object, 0 will be returned.
                                                          <a class="link" href="cairo-types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()">cairo_destroy_func_t</a> destroy);</pre>
 <p>
 Attach user data to <em class="parameter"><code>scaled_font</code></em>.  To remove user data from a surface,
-call this function with the key that was used to set it and <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+call this function with the key that was used to set it and <code class="literal">NULL</code>
 for <em class="parameter"><code>data</code></em>.</p>
 <p>
 </p>
@@ -995,9 +981,7 @@ slot could not be allocated for the user data.
 <p>
 Return user data previously attached to <em class="parameter"><code>scaled_font</code></em> using the
 specified key.  If no user data has been attached with the given
-key this function returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.</p>
+key this function returns <code class="literal">NULL</code>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1016,9 +1000,7 @@ attached to
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the user data previously attached or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.
+<td> the user data previously attached or <code class="literal">NULL</code>.
 
 </td>
 </tr>
diff --git a/doc/public/html/cairo-surface.html b/doc/public/html/cairo-surface.html
index ea6c64f..4b78656 100644
--- a/doc/public/html/cairo-surface.html
+++ b/doc/public/html/cairo-surface.html
@@ -48,6 +48,9 @@
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="cairo-surface.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">
+#define             <a class="link" href="cairo-surface.html#CAIRO-MIME-TYPE-JP2--CAPS" title="CAIRO_MIME_TYPE_JP2">CAIRO_MIME_TYPE_JP2</a>
+#define             <a class="link" href="cairo-surface.html#CAIRO-MIME-TYPE-JPEG--CAPS" title="CAIRO_MIME_TYPE_JPEG">CAIRO_MIME_TYPE_JPEG</a>
+#define             <a class="link" href="cairo-surface.html#CAIRO-MIME-TYPE-PNG--CAPS" title="CAIRO_MIME_TYPE_PNG">CAIRO_MIME_TYPE_PNG</a>
 typedef             <a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a>;
 enum                <a class="link" href="cairo-surface.html#cairo-content-t" title="enum cairo_content_t">cairo_content_t</a>;
 <a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *   <a class="link" href="cairo-surface.html#cairo-surface-create-similar" title="cairo_surface_create_similar ()">cairo_surface_create_similar</a>        (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *other,
@@ -94,6 +97,16 @@ void *              <a class="link" href="cairo-surface.html#cairo-surface-get-u
 void                <a class="link" href="cairo-surface.html#cairo-surface-copy-page" title="cairo_surface_copy_page ()">cairo_surface_copy_page</a>             (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface);
 void                <a class="link" href="cairo-surface.html#cairo-surface-show-page" title="cairo_surface_show_page ()">cairo_surface_show_page</a>             (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface);
 <a class="link" href="cairo-types.html#cairo-bool-t" title="cairo_bool_t">cairo_bool_t</a>        <a class="link" href="cairo-surface.html#cairo-surface-has-show-text-glyphs" title="cairo_surface_has_show_text_glyphs ()">cairo_surface_has_show_text_glyphs</a>  (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface);
+<a class="link" href="cairo-error-status.html#cairo-status-t" title="enum cairo_status_t">cairo_status_t</a>      <a class="link" href="cairo-surface.html#cairo-surface-set-mime-data" title="cairo_surface_set_mime_data ()">cairo_surface_set_mime_data</a>         (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
+                                                         const char *mime_type,
+                                                         unsigned char *data,
+                                                         unsigned int length,
+                                                         <a class="link" href="cairo-types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()">cairo_destroy_func_t</a> destroy,
+                                                         void *closure);
+void                <a class="link" href="cairo-surface.html#cairo-surface-get-mime-data" title="cairo_surface_get_mime_data ()">cairo_surface_get_mime_data</a>         (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
+                                                         const char *mime_type,
+                                                         unsigned char **data,
+                                                         unsigned int *length);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -111,6 +124,33 @@ cairo_<span class="emphasis"><em>backend</em></span><code class="function">_surf
 </div>
 <div class="refsect1" title="Details">
 <a name="cairo-surface.details"></a><h2>Details</h2>
+<div class="refsect2" title="CAIRO_MIME_TYPE_JP2">
+<a name="CAIRO-MIME-TYPE-JP2--CAPS"></a><h3>CAIRO_MIME_TYPE_JP2</h3>
+<pre class="programlisting">#define CAIRO_MIME_TYPE_JP2 "image/jp2"
+</pre>
+<p>
+The Joint Photographic Experts Group (JPEG) 2000 image coding standard (ISO/IEC 15444-1). Since 1.10
+</p>
+</div>
+<hr>
+<div class="refsect2" title="CAIRO_MIME_TYPE_JPEG">
+<a name="CAIRO-MIME-TYPE-JPEG--CAPS"></a><h3>CAIRO_MIME_TYPE_JPEG</h3>
+<pre class="programlisting">#define CAIRO_MIME_TYPE_JPEG "image/jpeg"
+</pre>
+<p>
+The Joint Photographic Experts Group (JPEG) image coding standard (ISO/IEC 10918-1). Since 1.10
+</p>
+</div>
+<hr>
+<div class="refsect2" title="CAIRO_MIME_TYPE_PNG">
+<a name="CAIRO-MIME-TYPE-PNG--CAPS"></a><h3>CAIRO_MIME_TYPE_PNG</h3>
+<pre class="programlisting">#define CAIRO_MIME_TYPE_PNG "image/png"
+</pre>
+<p>
+The Portable Network Graphics image file format (ISO/IEC 15948). Since 1.10
+</p>
+</div>
+<hr>
 <div class="refsect2" title="cairo_surface_t">
 <a name="cairo-surface-t"></a><h3>cairo_surface_t</h3>
 <pre class="programlisting">typedef struct _cairo_surface cairo_surface_t;
@@ -676,7 +716,8 @@ resolution if never set.</p>
     CAIRO_SURFACE_TYPE_SVG,
     CAIRO_SURFACE_TYPE_OS2,
     CAIRO_SURFACE_TYPE_WIN32_PRINTING,
-    CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
+    CAIRO_SURFACE_TYPE_QUARTZ_IMAGE,
+    CAIRO_SURFACE_TYPE_SCRIPT
 } cairo_surface_type_t;
 </pre>
 <p>
@@ -780,6 +821,11 @@ New entries may be added in future versions.</p>
 <td> The surface is of type quartz_image
 </td>
 </tr>
+<tr>
+<td><p><a name="CAIRO-SURFACE-TYPE-SCRIPT--CAPS"></a><span class="term"><code class="literal">CAIRO_SURFACE_TYPE_SCRIPT</code></span></p></td>
+<td> The surface is of type script, since 1.10
+</td>
+</tr>
 </tbody>
 </table></div>
 <p class="since">Since 1.2</p>
@@ -847,9 +893,7 @@ object is a nil object, 0 will be returned.
                                                          <a class="link" href="cairo-types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()">cairo_destroy_func_t</a> destroy);</pre>
 <p>
 Attach user data to <em class="parameter"><code>surface</code></em>.  To remove user data from a surface,
-call this function with the key that was used to set it and <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+call this function with the key that was used to set it and <code class="literal">NULL</code>
 for <em class="parameter"><code>data</code></em>.</p>
 <p>
 </p>
@@ -895,9 +939,7 @@ slot could not be allocated for the user data.
 <p>
 Return user data previously attached to <em class="parameter"><code>surface</code></em> using the specified
 key.  If no user data has been attached with the given key this
-function returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.</p>
+function returns <code class="literal">NULL</code>.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -916,9 +958,7 @@ attached to
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the user data previously attached or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>.
+<td> the user data previously attached or <code class="literal">NULL</code>.
 </td>
 </tr>
 </tbody>
@@ -983,9 +1023,7 @@ whether it actually uses the provided text and cluster data
 to a <a class="link" href="cairo-text.html#cairo-show-text-glyphs" title="cairo_show_text_glyphs ()"><code class="function">cairo_show_text_glyphs()</code></a> call.
 </p>
 <p>
-Note: Even if this function returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>, a
+Note: Even if this function returns <code class="literal">FALSE</code>, a
 <a class="link" href="cairo-text.html#cairo-show-text-glyphs" title="cairo_show_text_glyphs ()"><code class="function">cairo_show_text_glyphs()</code></a> operation targeted at <em class="parameter"><code>surface</code></em> will
 still succeed.  It just will
 act like a <a class="link" href="cairo-text.html#cairo-show-glyphs" title="cairo_show_glyphs ()"><code class="function">cairo_show_glyphs()</code></a> operation.  Users can use this
@@ -1003,12 +1041,8 @@ target surface does not use it.</p>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if <em class="parameter"><code>surface</code></em> supports
-              <a class="link" href="cairo-text.html#cairo-show-text-glyphs" title="cairo_show_text_glyphs ()"><code class="function">cairo_show_text_glyphs()</code></a>, <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise
+<td> <code class="literal">TRUE</code> if <em class="parameter"><code>surface</code></em> supports
+              <a class="link" href="cairo-text.html#cairo-show-text-glyphs" title="cairo_show_text_glyphs ()"><code class="function">cairo_show_text_glyphs()</code></a>, <code class="literal">FALSE</code> otherwise
 
 </td>
 </tr>
@@ -1016,6 +1050,106 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FAL
 </table></div>
 <p class="since">Since 1.8</p>
 </div>
+<hr>
+<div class="refsect2" title="cairo_surface_set_mime_data ()">
+<a name="cairo-surface-set-mime-data"></a><h3>cairo_surface_set_mime_data ()</h3>
+<pre class="programlisting"><a class="link" href="cairo-error-status.html#cairo-status-t" title="enum cairo_status_t">cairo_status_t</a>      cairo_surface_set_mime_data         (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
+                                                         const char *mime_type,
+                                                         unsigned char *data,
+                                                         unsigned int length,
+                                                         <a class="link" href="cairo-types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()">cairo_destroy_func_t</a> destroy,
+                                                         void *closure);</pre>
+<p>
+Attach an image in the format <em class="parameter"><code>mime_type</code></em> to <em class="parameter"><code>surface</code></em>. To remove
+the data from a surface, call this function with same mime type
+and <code class="literal">NULL</code> for <em class="parameter"><code>data</code></em>.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td>
+<td> a <a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mime_type</code></em> :</span></p></td>
+<td> the mime type of the image data
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
+<td> the image data to attach to the surface
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
+<td> the length of the image data
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
+<td> a <a class="link" href="cairo-types.html#cairo-destroy-func-t" title="cairo_destroy_func_t ()"><span class="type">cairo_destroy_func_t</span></a> which will be called when the
+surface is destroyed or when new image data is attached using the
+same mime type.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
+<td> the data to be passed to the <em class="parameter"><code>destroy</code></em> notifier
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> <a class="link" href="cairo-error-status.html#CAIRO-STATUS-SUCCESS--CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a class="link" href="cairo-error-status.html#CAIRO-STATUS-NO-MEMORY--CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a
+slot could not be allocated for the user data.
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 1.10</p>
+</div>
+<hr>
+<div class="refsect2" title="cairo_surface_get_mime_data ()">
+<a name="cairo-surface-get-mime-data"></a><h3>cairo_surface_get_mime_data ()</h3>
+<pre class="programlisting">void                cairo_surface_get_mime_data         (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface,
+                                                         const char *mime_type,
+                                                         unsigned char **data,
+                                                         unsigned int *length);</pre>
+<p>
+Return mime data previously attached to <em class="parameter"><code>surface</code></em> using the
+specified mime type.  If no data has been attached with the given
+mime type, <em class="parameter"><code>data</code></em> is set <code class="literal">NULL</code>.</p>
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td>
+<td> a <a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>mime_type</code></em> :</span></p></td>
+<td> the mime type of the image data
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
+<td> the image data to attached to the surface
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
+<td> the length of the image data
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 1.10</p>
+</div>
 </div>
 <div class="refsect1" title="See Also">
 <a name="cairo-surface.see-also"></a><h2>See Also</h2>
diff --git a/doc/public/html/cairo-svg-surface.html b/doc/public/html/cairo-svg-surface.html
index ef401e4..33794ab 100644
--- a/doc/public/html/cairo-svg-surface.html
+++ b/doc/public/html/cairo-svg-surface.html
@@ -99,9 +99,7 @@ to <em class="parameter"><code>filename</code></em>.</p>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td> a filename for the SVG output (must be writable), <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> may be
+<td> a filename for the SVG output (must be writable), <code class="literal">NULL</code> may be
            used to specify no output. This will generate a SVG surface that
            may be queried and used as a source, without generating a
            temporary file.
@@ -150,9 +148,7 @@ incrementally to the stream represented by <em class="parameter"><code>write_fun
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td>
-<td> a <a class="link" href="cairo-png-functions.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a <a class="link" href="cairo-png-functions.html#cairo-write-func-t" title="cairo_write_func_t ()"><span class="type">cairo_write_func_t</span></a> to accept the output data, may be <code class="literal">NULL</code>
              to indicate a no-op <em class="parameter"><code>write_func</code></em>. With a no-op <em class="parameter"><code>write_func</code></em>,
              the surface may be queried or used as a source without
              generating any temporary files.
@@ -285,9 +281,7 @@ Used to retrieve the list of supported versions. See
 <pre class="programlisting">const char *        cairo_svg_version_to_string         (<a class="link" href="cairo-svg-surface.html#cairo-svg-version-t" title="enum cairo_svg_version_t">cairo_svg_version_t</a> version);</pre>
 <p>
 Get the string representation of the given <em class="parameter"><code>version</code></em> id. This function
-will return <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if <em class="parameter"><code>version</code></em> isn't valid. See <a class="link" href="cairo-svg-surface.html#cairo-svg-get-versions" title="cairo_svg_get_versions ()"><code class="function">cairo_svg_get_versions()</code></a>
+will return <code class="literal">NULL</code> if <em class="parameter"><code>version</code></em> isn't valid. See <a class="link" href="cairo-svg-surface.html#cairo-svg-get-versions" title="cairo_svg_get_versions ()"><code class="function">cairo_svg_get_versions()</code></a>
 for a way to get the list of valid version ids.</p>
 <p>
 </p>
diff --git a/doc/public/html/cairo-text.html b/doc/public/html/cairo-text.html
index e9e81d7..bf292b8 100644
--- a/doc/public/html/cairo-text.html
+++ b/doc/public/html/cairo-text.html
@@ -337,6 +337,14 @@ remember), but the standard CSS2 generic family names, ("serif",
 work as expected.
 </p>
 <p>
+If <em class="parameter"><code>family</code></em> starts with the string "<em class="parameter"><code>cairo</code></em>:", or if no native font
+backends are compiled in, cairo will use an internal font family.
+The internal font family recognizes many modifiers in the <em class="parameter"><code>family</code></em>
+string, most notably, it recognizes the string "monospace".  That is,
+the family name "<em class="parameter"><code>cairo</code></em>:monospace" will use the monospace version of
+the internal font family.
+</p>
+<p>
 For "real" font selection, see the font-backend-specific
 font_face_create functions for the font backend you are using. (For
 example, if you are using the freetype-based cairo-ft font backend,
@@ -563,9 +571,7 @@ destroyed if there are no other references to it.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td>
-<td> a <a class="link" href="cairo-font-face.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a>, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> to restore to the default font
+<td> a <a class="link" href="cairo-font-face.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a>, or <code class="literal">NULL</code> to restore to the default font
 </td>
 </tr>
 </tbody>
@@ -593,9 +599,7 @@ Gets the current font face for a <a class="link" href="cairo-context.html#cairo-
 cairo. To keep a reference to it, you must call
 <a class="link" href="cairo-font-face.html#cairo-font-face-reference" title="cairo_font_face_reference ()"><code class="function">cairo_font_face_reference()</code></a>.
 
-This function never returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>. If memory cannot be allocated, a
+This function never returns <code class="literal">NULL</code>. If memory cannot be allocated, a
 special "nil" <a class="link" href="cairo-font-face.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a> object will be returned on which
 <a class="link" href="cairo-font-face.html#cairo-font-face-status" title="cairo_font_face_status ()"><code class="function">cairo_font_face_status()</code></a> returns <a class="link" href="cairo-error-status.html#CAIRO-STATUS-NO-MEMORY--CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. Using
 this nil object will cause its error state to propagate to other
@@ -659,9 +663,7 @@ Gets the current scaled font for a <a class="link" href="cairo-context.html#cair
 cairo. To keep a reference to it, you must call
 <a class="link" href="cairo-scaled-font.html#cairo-scaled-font-reference" title="cairo_scaled_font_reference ()"><code class="function">cairo_scaled_font_reference()</code></a>.
 
-This function never returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>. If memory cannot be allocated, a
+This function never returns <code class="literal">NULL</code>. If memory cannot be allocated, a
 special "nil" <a class="link" href="cairo-scaled-font.html#cairo-scaled-font-t" title="cairo_scaled_font_t"><span class="type">cairo_scaled_font_t</span></a> object will be returned on which
 <a class="link" href="cairo-scaled-font.html#cairo-scaled-font-status" title="cairo_scaled_font_status ()"><code class="function">cairo_scaled_font_status()</code></a> returns <a class="link" href="cairo-error-status.html#CAIRO-STATUS-NO-MEMORY--CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. Using
 this nil object will cause its error state to propagate to other
@@ -717,9 +719,7 @@ serious text-using applications. See <a class="link" href="cairo-text.html#cairo
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td>
-<td> a NUL-terminated string of text encoded in UTF-8, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a NUL-terminated string of text encoded in UTF-8, or <code class="literal">NULL</code>
 </td>
 </tr>
 </tbody>
@@ -900,9 +900,7 @@ affect the x_advance and y_advance values.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td>
-<td> a NUL-terminated string of text encoded in UTF-8, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a NUL-terminated string of text encoded in UTF-8, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -979,7 +977,7 @@ family is assumed.  The default family then can be queried using
 </p>
 <p>
 The <a class="link" href="cairo-text.html#cairo-select-font-face" title="cairo_select_font_face ()"><code class="function">cairo_select_font_face()</code></a> function uses this to create font faces.
-See that function for limitations of toy font faces.</p>
+See that function for limitations and other details of toy font faces.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1103,12 +1101,8 @@ For all other uses, user can use their own allocation method
 for glyphs.
 </p>
 <p>
-This function returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if <em class="parameter"><code>num_glyphs</code></em> is not positive,
-or if out of memory.  That means, the <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> return value
+This function returns <code class="literal">NULL</code> if <em class="parameter"><code>num_glyphs</code></em> is not positive,
+or if out of memory.  That means, the <code class="literal">NULL</code> return value
 signals out-of-memory only if <em class="parameter"><code>num_glyphs</code></em> was positive.</p>
 <p>
 </p>
@@ -1148,9 +1142,7 @@ for glyphs.</p>
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></p></td>
-<td> array of glyphs to free, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> array of glyphs to free, or <code class="literal">NULL</code>
 </td>
 </tr></tbody>
 </table></div>
@@ -1169,12 +1161,8 @@ For all other uses, user can use their own allocation method
 for text clusters.
 </p>
 <p>
-This function returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if <em class="parameter"><code>num_clusters</code></em> is not positive,
-or if out of memory.  That means, the <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> return value
+This function returns <code class="literal">NULL</code> if <em class="parameter"><code>num_clusters</code></em> is not positive,
+or if out of memory.  That means, the <code class="literal">NULL</code> return value
 signals out-of-memory only if <em class="parameter"><code>num_clusters</code></em> was positive.</p>
 <p>
 </p>
@@ -1214,9 +1202,7 @@ for text clusters.</p>
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>clusters</code></em> :</span></p></td>
-<td> array of text clusters to free, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> array of text clusters to free, or <code class="literal">NULL</code>
 </td>
 </tr></tbody>
 </table></div>
diff --git a/doc/public/html/cairo-user-font.html b/doc/public/html/cairo-user-font.html
index 5b4a07f..bcf21ca 100644
--- a/doc/public/html/cairo-user-font.html
+++ b/doc/public/html/cairo-user-font.html
@@ -172,8 +172,7 @@ in deadlock.</p>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a class="link" href="cairo-error-status.html#CAIRO-STATUS-SUCCESS--CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> upon success, or
-<a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-ERROR--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_ERROR</code></a> or any other error status on error.
+<td> <a class="link" href="cairo-error-status.html#CAIRO-STATUS-SUCCESS--CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> upon success, or an error status on error.
 
 </td>
 </tr>
@@ -284,9 +283,7 @@ Arabic and Indic.
 </p>
 <p>
 The <em class="parameter"><code>num_glyphs</code></em> argument is preset to the number of glyph entries available
-in the <em class="parameter"><code>glyphs</code></em> buffer. If the <em class="parameter"><code>glyphs</code></em> buffer is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, the value of
+in the <em class="parameter"><code>glyphs</code></em> buffer. If the <em class="parameter"><code>glyphs</code></em> buffer is <code class="literal">NULL</code>, the value of
 <em class="parameter"><code>num_glyphs</code></em> will be zero.  If the provided glyph array is too short for
 the conversion (or for convenience), a new glyph array may be allocated
 using <a class="link" href="cairo-text.html#cairo-glyph-allocate" title="cairo_glyph_allocate ()"><code class="function">cairo_glyph_allocate()</code></a> and placed in <em class="parameter"><code>glyphs</code></em>.  Upon return,
@@ -297,16 +294,10 @@ The callback should populate the glyph indices and positions (in font space)
 assuming that the text is to be shown at the origin.
 </p>
 <p>
-If <em class="parameter"><code>clusters</code></em> is not <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, <em class="parameter"><code>num_clusters</code></em> and <em class="parameter"><code>cluster_flags</code></em> are also
-non-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>, and cluster mapping should be computed. The semantics of how
+If <em class="parameter"><code>clusters</code></em> is not <code class="literal">NULL</code>, <em class="parameter"><code>num_clusters</code></em> and <em class="parameter"><code>cluster_flags</code></em> are also
+non-<code class="literal">NULL</code>, and cluster mapping should be computed. The semantics of how
 cluster array allocation works is similar to the glyph array.  That is,
-if <em class="parameter"><code>clusters</code></em> initially points to a non-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> value, that array may be used
+if <em class="parameter"><code>clusters</code></em> initially points to a non-<code class="literal">NULL</code> value, that array may be used
 as a cluster buffer, and <em class="parameter"><code>num_clusters</code></em> points to the number of cluster
 entries available there.  If the provided cluster array is too short for
 the conversion (or for convenience), a new cluster array may be allocated
@@ -317,7 +308,8 @@ will free the allocated cluster array using <a class="link" href="cairo-text.htm
 </p>
 <p>
 The callback is optional.  If <em class="parameter"><code>num_glyphs</code></em> is negative upon
-the callback returning, the unicode_to_glyph callback
+the callback returning or if the return value
+is <a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</code></a>, the unicode_to_glyph callback
 is tried.  See <a class="link" href="cairo-user-font.html#cairo-user-scaled-font-unicode-to-glyph-func-t" title="cairo_user_scaled_font_unicode_to_glyph_func_t ()"><span class="type">cairo_user_scaled_font_unicode_to_glyph_func_t</span></a>.
 </p>
 <p>
@@ -360,9 +352,7 @@ glyph value for other purposes.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>clusters</code></em> :</span></p></td>
-<td> pointer to array of cluster mapping information to fill, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> pointer to array of cluster mapping information to fill, or <code class="literal">NULL</code>
 </td>
 </tr>
 <tr>
@@ -378,8 +368,9 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NUL
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a class="link" href="cairo-error-status.html#CAIRO-STATUS-SUCCESS--CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> upon success, or
-<a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-ERROR--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_ERROR</code></a> or any other error status on error.
+<td> <a class="link" href="cairo-error-status.html#CAIRO-STATUS-SUCCESS--CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> upon success,
+<a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</code></a> if fallback options should be tried,
+or <a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-ERROR--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_ERROR</code></a> or any other error status on error.
 
 </td>
 </tr>
@@ -411,8 +402,9 @@ complex scripts can be implemented using this callback.
 </p>
 <p>
 The callback is optional, and only used if text_to_glyphs callback is not
-set or fails to return glyphs.  If this callback is not set, an identity
-mapping from Unicode code-points to glyph indices is assumed.
+set or fails to return glyphs.  If this callback is not set or if it returns
+<a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</code></a>, an identity mapping from Unicode
+code-points to glyph indices is assumed.
 </p>
 <p>
 Note: While cairo does not impose any limitation on glyph indices,
@@ -444,8 +436,9 @@ glyph value for other purposes.</p>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a class="link" href="cairo-error-status.html#CAIRO-STATUS-SUCCESS--CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> upon success, or
-<a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-ERROR--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_ERROR</code></a> or any other error status on error.
+<td> <a class="link" href="cairo-error-status.html#CAIRO-STATUS-SUCCESS--CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> upon success,
+<a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</code></a> if fallback options should be tried,
+or <a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-ERROR--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_ERROR</code></a> or any other error status on error.
 
 </td>
 </tr>
@@ -510,9 +503,7 @@ is created from it.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>init_func</code></em> :</span></p></td>
-<td> The init callback, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> The init callback, or <code class="literal">NULL</code>
 </td>
 </tr>
 </tbody>
@@ -539,9 +530,7 @@ Gets the scaled-font initialization function of a user-font.</p>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> The init callback of <em class="parameter"><code>font_face</code></em>
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if none set or an error has occurred.
+or <code class="literal">NULL</code> if none set or an error has occurred.
 
 </td>
 </tr>
@@ -567,9 +556,7 @@ is created from it.
 </p>
 <p>
 The render_glyph callback is the only mandatory callback of a user-font.
-If the callback is <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> and a glyph is tried to be rendered using
+If the callback is <code class="literal">NULL</code> and a glyph is tried to be rendered using
 <em class="parameter"><code>font_face</code></em>, a <a class="link" href="cairo-error-status.html#CAIRO-STATUS-USER-FONT-ERROR--CAPS"><code class="literal">CAIRO_STATUS_USER_FONT_ERROR</code></a> will occur.</p>
 <p>
 </p>
@@ -583,9 +570,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NUL
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>render_glyph_func</code></em> :</span></p></td>
-<td> The render_glyph callback, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> The render_glyph callback, or <code class="literal">NULL</code>
 </td>
 </tr>
 </tbody>
@@ -612,9 +597,7 @@ Gets the glyph rendering function of a user-font.</p>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> The render_glyph callback of <em class="parameter"><code>font_face</code></em>
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if none set or an error has occurred.
+or <code class="literal">NULL</code> if none set or an error has occurred.
 
 </td>
 </tr>
@@ -649,9 +632,7 @@ is created from it.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>unicode_to_glyph_func</code></em> :</span></p></td>
-<td> The unicode_to_glyph callback, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> The unicode_to_glyph callback, or <code class="literal">NULL</code>
 </td>
 </tr>
 </tbody>
@@ -678,9 +659,7 @@ Gets the unicode-to-glyph conversion function of a user-font.</p>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> The unicode_to_glyph callback of <em class="parameter"><code>font_face</code></em>
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if none set or an error occurred.
+or <code class="literal">NULL</code> if none set or an error occurred.
 
 </td>
 </tr>
@@ -715,9 +694,7 @@ is created from it.</p>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>text_to_glyphs_func</code></em> :</span></p></td>
-<td> The text_to_glyphs callback, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> The text_to_glyphs callback, or <code class="literal">NULL</code>
 </td>
 </tr>
 </tbody>
@@ -744,9 +721,7 @@ Gets the text-to-glyphs conversion function of a user-font.</p>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> The text_to_glyphs callback of <em class="parameter"><code>font_face</code></em>
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if none set or an error occurred.
+or <code class="literal">NULL</code> if none set or an error occurred.
 
 </td>
 </tr>
diff --git a/doc/public/html/cairo-version-info.html b/doc/public/html/cairo-version-info.html
index aac1de5..6a4be53 100644
--- a/doc/public/html/cairo-version-info.html
+++ b/doc/public/html/cairo-version-info.html
@@ -98,7 +98,7 @@ In-progress development (eg. from git)
 <p>
 </p>
 <div class="refsect2" title="Compatibility">
-<a name="id2750883"></a><h3>Compatibility</h3>
+<a name="id2887362"></a><h3>Compatibility</h3>
 <p>
 The API/ABI compatibility guarantees for various versions are as
 follows. First, let's assume some cairo-using application code that is
@@ -126,7 +126,7 @@ rather the many states between snapshots and releases.
 </div>
 <hr>
 <div class="refsect2" title="Examining the version">
-<a name="id2750921"></a><h3>Examining the version</h3>
+<a name="id2887400"></a><h3>Examining the version</h3>
 <p>
 Cairo provides the ability to examine the version at either
 compile-time or run-time and in both a human-readable form as well as
diff --git a/doc/public/html/cairo-win32-font.html b/doc/public/html/cairo-win32-font.html
index 1e4ae4b..056e74f 100644
--- a/doc/public/html/cairo-win32-font.html
+++ b/doc/public/html/cairo-win32-font.html
@@ -80,7 +80,8 @@ Microsoft Windows systems.
 <a name="cairo-win32-font.details"></a><h2>Details</h2>
 <div class="refsect2" title="CAIRO_HAS_WIN32_FONT">
 <a name="CAIRO-HAS-WIN32-FONT--CAPS"></a><h3>CAIRO_HAS_WIN32_FONT</h3>
-<pre class="programlisting">#define             CAIRO_HAS_WIN32_FONT</pre>
+<pre class="programlisting">#define CAIRO_HAS_WIN32_FONT 1
+</pre>
 <p>
 Defined if the Microsoft Windows font backend is available.
 This macro can be used to conditionally compile backend-specific code.
@@ -171,7 +172,7 @@ and can be used with functions such as <a class="link" href="cairo-win32-font.ht
 <tr>
 <td><p><span class="term"><em class="parameter"><code>logfont</code></em> :</span></p></td>
 <td> A <span class="type">LOGFONTW</span> structure specifying the font to use.
-  If hfont is null then the lfHeight, lfWidth, lfOrientation and lfEscapement
+  If <em class="parameter"><code>font</code></em> is <code class="literal">NULL</code> then the lfHeight, lfWidth, lfOrientation and lfEscapement
   fields of this structure are ignored. Otherwise lfWidth, lfOrientation and
   lfEscapement must be zero.
 </td>
diff --git a/doc/public/html/cairo-win32-surface.html b/doc/public/html/cairo-win32-surface.html
index cb38728..324b3fa 100644
--- a/doc/public/html/cairo-win32-surface.html
+++ b/doc/public/html/cairo-win32-surface.html
@@ -82,7 +82,8 @@ The surface returned by the other win32 constructors is of surface type
 <a name="cairo-win32-surface.details"></a><h2>Details</h2>
 <div class="refsect2" title="CAIRO_HAS_WIN32_SURFACE">
 <a name="CAIRO-HAS-WIN32-SURFACE--CAPS"></a><h3>CAIRO_HAS_WIN32_SURFACE</h3>
-<pre class="programlisting">#define             CAIRO_HAS_WIN32_SURFACE</pre>
+<pre class="programlisting">#define CAIRO_HAS_WIN32_SURFACE 1
+</pre>
 <p>
 Defined if the Microsoft Windows surface backend is available.
 This macro can be used to conditionally compile backend-specific code.
@@ -243,12 +244,8 @@ associated methods must be used for correct output.</p>
 <a name="cairo-win32-surface-get-dc"></a><h3>cairo_win32_surface_get_dc ()</h3>
 <pre class="programlisting">HDC                 cairo_win32_surface_get_dc          (<a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t">cairo_surface_t</a> *surface);</pre>
 <p>
-Returns the HDC associated with this surface, or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if none.
-Also returns <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if the surface is not a win32 surface.</p>
+Returns the HDC associated with this surface, or <code class="literal">NULL</code> if none.
+Also returns <code class="literal">NULL</code> if the surface is not a win32 surface.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -261,9 +258,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NUL
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> HDC or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if no HDC available.
+<td> HDC or <code class="literal">NULL</code> if no HDC available.
 
 </td>
 </tr>
@@ -278,9 +273,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NUL
 <p>
 Returns a <a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a> image surface that refers to the same bits
 as the DIB of the Win32 surface.  If the passed-in win32 surface
-is not a DIB surface, <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> is returned.</p>
+is not a DIB surface, <code class="literal">NULL</code> is returned.</p>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -294,9 +287,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NUL
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> a <a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a> (owned by the win32 <a class="link" href="cairo-surface.html#cairo-surface-t" title="cairo_surface_t"><span class="type">cairo_surface_t</span></a>),
-or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if the win32 surface is not a DIB.
+or <code class="literal">NULL</code> if the win32 surface is not a DIB.
 
 </td>
 </tr>
diff --git a/doc/public/html/cairo.devhelp b/doc/public/html/cairo.devhelp
index 374e153..2d472a9 100644
--- a/doc/public/html/cairo.devhelp
+++ b/doc/public/html/cairo.devhelp
@@ -264,6 +264,7 @@
     <function name="cairo_font_options_set_hint_metrics ()" link="cairo-font-options.html#cairo-font-options-set-hint-metrics"/>
     <function name="cairo_font_options_get_hint_metrics ()" link="cairo-font-options.html#cairo-font-options-get-hint-metrics"/>
     <function name="CAIRO_HAS_FT_FONT" link="cairo-ft-font.html#CAIRO-HAS-FT-FONT--CAPS"/>
+    <function name="CAIRO_HAS_FC_FONT" link="cairo-ft-font.html#CAIRO-HAS-FC-FONT--CAPS"/>
     <function name="cairo_ft_font_face_create_for_ft_face ()" link="cairo-ft-font.html#cairo-ft-font-face-create-for-ft-face"/>
     <function name="cairo_ft_font_face_create_for_pattern ()" link="cairo-ft-font.html#cairo-ft-font-face-create-for-pattern"/>
     <function name="cairo_ft_font_options_substitute ()" link="cairo-ft-font.html#cairo-ft-font-options-substitute"/>
@@ -295,6 +296,9 @@
     <function name="cairo_user_font_face_get_unicode_to_glyph_func ()" link="cairo-user-font.html#cairo-user-font-face-get-unicode-to-glyph-func"/>
     <function name="cairo_user_font_face_set_text_to_glyphs_func ()" link="cairo-user-font.html#cairo-user-font-face-set-text-to-glyphs-func"/>
     <function name="cairo_user_font_face_get_text_to_glyphs_func ()" link="cairo-user-font.html#cairo-user-font-face-get-text-to-glyphs-func"/>
+    <function name="CAIRO_MIME_TYPE_JP2" link="cairo-surface.html#CAIRO-MIME-TYPE-JP2--CAPS"/>
+    <function name="CAIRO_MIME_TYPE_JPEG" link="cairo-surface.html#CAIRO-MIME-TYPE-JPEG--CAPS"/>
+    <function name="CAIRO_MIME_TYPE_PNG" link="cairo-surface.html#CAIRO-MIME-TYPE-PNG--CAPS"/>
     <function name="cairo_surface_t" link="cairo-surface.html#cairo-surface-t"/>
     <function name="enum cairo_content_t" link="cairo-surface.html#cairo-content-t"/>
     <function name="cairo_surface_create_similar ()" link="cairo-surface.html#cairo-surface-create-similar"/>
@@ -319,6 +323,8 @@
     <function name="cairo_surface_copy_page ()" link="cairo-surface.html#cairo-surface-copy-page"/>
     <function name="cairo_surface_show_page ()" link="cairo-surface.html#cairo-surface-show-page"/>
     <function name="cairo_surface_has_show_text_glyphs ()" link="cairo-surface.html#cairo-surface-has-show-text-glyphs"/>
+    <function name="cairo_surface_set_mime_data ()" link="cairo-surface.html#cairo-surface-set-mime-data"/>
+    <function name="cairo_surface_get_mime_data ()" link="cairo-surface.html#cairo-surface-get-mime-data"/>
     <function name="CAIRO_HAS_IMAGE_SURFACE" link="cairo-image-surface.html#CAIRO-HAS-IMAGE-SURFACE--CAPS"/>
     <function name="enum cairo_format_t" link="cairo-image-surface.html#cairo-format-t"/>
     <function name="cairo_format_stride_for_width ()" link="cairo-image-surface.html#cairo-format-stride-for-width"/>
@@ -332,6 +338,10 @@
     <function name="CAIRO_HAS_PDF_SURFACE" link="cairo-pdf-surface.html#CAIRO-HAS-PDF-SURFACE--CAPS"/>
     <function name="cairo_pdf_surface_create ()" link="cairo-pdf-surface.html#cairo-pdf-surface-create"/>
     <function name="cairo_pdf_surface_create_for_stream ()" link="cairo-pdf-surface.html#cairo-pdf-surface-create-for-stream"/>
+    <function name="cairo_pdf_surface_restrict_to_version ()" link="cairo-pdf-surface.html#cairo-pdf-surface-restrict-to-version"/>
+    <function name="enum cairo_pdf_version_t" link="cairo-pdf-surface.html#cairo-pdf-version-t"/>
+    <function name="cairo_pdf_get_versions ()" link="cairo-pdf-surface.html#cairo-pdf-get-versions"/>
+    <function name="cairo_pdf_version_to_string ()" link="cairo-pdf-surface.html#cairo-pdf-version-to-string"/>
     <function name="cairo_pdf_surface_set_size ()" link="cairo-pdf-surface.html#cairo-pdf-surface-set-size"/>
     <function name="CAIRO_HAS_PNG_FUNCTIONS" link="cairo-png-functions.html#CAIRO-HAS-PNG-FUNCTIONS--CAPS"/>
     <function name="cairo_image_surface_create_from_png ()" link="cairo-png-functions.html#cairo-image-surface-create-from-png"/>
@@ -399,8 +409,8 @@
     <function name="enum cairo_status_t" link="cairo-error-status.html#cairo-status-t"/>
     <function name="cairo_status_to_string ()" link="cairo-error-status.html#cairo-status-to-string"/>
     <function name="cairo_debug_reset_static_data ()" link="cairo-error-status.html#cairo-debug-reset-static-data"/>
-    <function name="Compatibility" link="cairo-version-info.html#id2750883"/>
-    <function name="Examining the version" link="cairo-version-info.html#id2750921"/>
+    <function name="Compatibility" link="cairo-version-info.html#id2887362"/>
+    <function name="Examining the version" link="cairo-version-info.html#id2887400"/>
     <function name="CAIRO_VERSION" link="cairo-version-info.html#CAIRO-VERSION--CAPS"/>
     <function name="CAIRO_VERSION_MAJOR" link="cairo-version-info.html#CAIRO-VERSION-MAJOR--CAPS"/>
     <function name="CAIRO_VERSION_MINOR" link="cairo-version-info.html#CAIRO-VERSION-MINOR--CAPS"/>
diff --git a/doc/public/html/cairo.devhelp2 b/doc/public/html/cairo.devhelp2
index 6700f5e..afa2bc5 100644
--- a/doc/public/html/cairo.devhelp2
+++ b/doc/public/html/cairo.devhelp2
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="Cairo: A Vector Graphics Library" link="index.html" author="" name="cairo" version="2">
+<book xmlns="http://www.devhelp.net/book" title="Cairo: A Vector Graphics Library" link="index.html" author="" name="cairo" version="2" language="c">
   <chapters>
     <sub name="Drawing" link="cairo-drawing.html">
       <sub name="cairo_t" link="cairo-context.html"/>
@@ -264,6 +264,7 @@
     <keyword type="function" name="cairo_font_options_set_hint_metrics ()" link="cairo-font-options.html#cairo-font-options-set-hint-metrics"/>
     <keyword type="function" name="cairo_font_options_get_hint_metrics ()" link="cairo-font-options.html#cairo-font-options-get-hint-metrics"/>
     <keyword type="macro" name="CAIRO_HAS_FT_FONT" link="cairo-ft-font.html#CAIRO-HAS-FT-FONT--CAPS"/>
+    <keyword type="macro" name="CAIRO_HAS_FC_FONT" link="cairo-ft-font.html#CAIRO-HAS-FC-FONT--CAPS"/>
     <keyword type="function" name="cairo_ft_font_face_create_for_ft_face ()" link="cairo-ft-font.html#cairo-ft-font-face-create-for-ft-face"/>
     <keyword type="function" name="cairo_ft_font_face_create_for_pattern ()" link="cairo-ft-font.html#cairo-ft-font-face-create-for-pattern"/>
     <keyword type="function" name="cairo_ft_font_options_substitute ()" link="cairo-ft-font.html#cairo-ft-font-options-substitute"/>
@@ -295,6 +296,9 @@
     <keyword type="function" name="cairo_user_font_face_get_unicode_to_glyph_func ()" link="cairo-user-font.html#cairo-user-font-face-get-unicode-to-glyph-func" since="1.8"/>
     <keyword type="function" name="cairo_user_font_face_set_text_to_glyphs_func ()" link="cairo-user-font.html#cairo-user-font-face-set-text-to-glyphs-func" since="1.8"/>
     <keyword type="function" name="cairo_user_font_face_get_text_to_glyphs_func ()" link="cairo-user-font.html#cairo-user-font-face-get-text-to-glyphs-func" since="1.8"/>
+    <keyword type="macro" name="CAIRO_MIME_TYPE_JP2" link="cairo-surface.html#CAIRO-MIME-TYPE-JP2--CAPS"/>
+    <keyword type="macro" name="CAIRO_MIME_TYPE_JPEG" link="cairo-surface.html#CAIRO-MIME-TYPE-JPEG--CAPS"/>
+    <keyword type="macro" name="CAIRO_MIME_TYPE_PNG" link="cairo-surface.html#CAIRO-MIME-TYPE-PNG--CAPS"/>
     <keyword type="typedef" name="cairo_surface_t" link="cairo-surface.html#cairo-surface-t"/>
     <keyword type="enum" name="enum cairo_content_t" link="cairo-surface.html#cairo-content-t"/>
     <keyword type="function" name="cairo_surface_create_similar ()" link="cairo-surface.html#cairo-surface-create-similar"/>
@@ -319,6 +323,8 @@
     <keyword type="function" name="cairo_surface_copy_page ()" link="cairo-surface.html#cairo-surface-copy-page" since="1.6"/>
     <keyword type="function" name="cairo_surface_show_page ()" link="cairo-surface.html#cairo-surface-show-page" since="1.6"/>
     <keyword type="function" name="cairo_surface_has_show_text_glyphs ()" link="cairo-surface.html#cairo-surface-has-show-text-glyphs" since="1.8"/>
+    <keyword type="function" name="cairo_surface_set_mime_data ()" link="cairo-surface.html#cairo-surface-set-mime-data" since="1.10"/>
+    <keyword type="function" name="cairo_surface_get_mime_data ()" link="cairo-surface.html#cairo-surface-get-mime-data" since="1.10"/>
     <keyword type="macro" name="CAIRO_HAS_IMAGE_SURFACE" link="cairo-image-surface.html#CAIRO-HAS-IMAGE-SURFACE--CAPS" since="1.8"/>
     <keyword type="enum" name="enum cairo_format_t" link="cairo-image-surface.html#cairo-format-t"/>
     <keyword type="function" name="cairo_format_stride_for_width ()" link="cairo-image-surface.html#cairo-format-stride-for-width" since="1.6"/>
@@ -332,6 +338,10 @@
     <keyword type="macro" name="CAIRO_HAS_PDF_SURFACE" link="cairo-pdf-surface.html#CAIRO-HAS-PDF-SURFACE--CAPS"/>
     <keyword type="function" name="cairo_pdf_surface_create ()" link="cairo-pdf-surface.html#cairo-pdf-surface-create" since="1.2"/>
     <keyword type="function" name="cairo_pdf_surface_create_for_stream ()" link="cairo-pdf-surface.html#cairo-pdf-surface-create-for-stream" since="1.2"/>
+    <keyword type="function" name="cairo_pdf_surface_restrict_to_version ()" link="cairo-pdf-surface.html#cairo-pdf-surface-restrict-to-version" since="1.10"/>
+    <keyword type="enum" name="enum cairo_pdf_version_t" link="cairo-pdf-surface.html#cairo-pdf-version-t"/>
+    <keyword type="function" name="cairo_pdf_get_versions ()" link="cairo-pdf-surface.html#cairo-pdf-get-versions" since="1.10"/>
+    <keyword type="function" name="cairo_pdf_version_to_string ()" link="cairo-pdf-surface.html#cairo-pdf-version-to-string" since="1.10"/>
     <keyword type="function" name="cairo_pdf_surface_set_size ()" link="cairo-pdf-surface.html#cairo-pdf-surface-set-size" since="1.2"/>
     <keyword type="macro" name="CAIRO_HAS_PNG_FUNCTIONS" link="cairo-png-functions.html#CAIRO-HAS-PNG-FUNCTIONS--CAPS"/>
     <keyword type="function" name="cairo_image_surface_create_from_png ()" link="cairo-png-functions.html#cairo-image-surface-create-from-png"/>
@@ -399,8 +409,8 @@
     <keyword type="enum" name="enum cairo_status_t" link="cairo-error-status.html#cairo-status-t"/>
     <keyword type="function" name="cairo_status_to_string ()" link="cairo-error-status.html#cairo-status-to-string"/>
     <keyword type="function" name="cairo_debug_reset_static_data ()" link="cairo-error-status.html#cairo-debug-reset-static-data"/>
-    <keyword type="" name="Compatibility" link="cairo-version-info.html#id2750883"/>
-    <keyword type="" name="Examining the version" link="cairo-version-info.html#id2750921"/>
+    <keyword type="" name="Compatibility" link="cairo-version-info.html#id2887362"/>
+    <keyword type="" name="Examining the version" link="cairo-version-info.html#id2887400"/>
     <keyword type="macro" name="CAIRO_VERSION" link="cairo-version-info.html#CAIRO-VERSION--CAPS"/>
     <keyword type="macro" name="CAIRO_VERSION_MAJOR" link="cairo-version-info.html#CAIRO-VERSION-MAJOR--CAPS"/>
     <keyword type="macro" name="CAIRO_VERSION_MINOR" link="cairo-version-info.html#CAIRO-VERSION-MINOR--CAPS"/>
@@ -413,5 +423,136 @@
     <keyword type="typedef" name="cairo_bool_t" link="cairo-types.html#cairo-bool-t"/>
     <keyword type="struct" name="cairo_user_data_key_t" link="cairo-types.html#cairo-user-data-key-t"/>
     <keyword type="function" name="cairo_destroy_func_t ()" link="cairo-types.html#cairo-destroy-func-t"/>
+    <keyword type="constant" name="CAIRO_ANTIALIAS_DEFAULT" link="cairo-context.html#CAIRO-ANTIALIAS-DEFAULT--CAPS"/>
+    <keyword type="constant" name="CAIRO_ANTIALIAS_NONE" link="cairo-context.html#CAIRO-ANTIALIAS-NONE--CAPS"/>
+    <keyword type="constant" name="CAIRO_ANTIALIAS_GRAY" link="cairo-context.html#CAIRO-ANTIALIAS-GRAY--CAPS"/>
+    <keyword type="constant" name="CAIRO_ANTIALIAS_SUBPIXEL" link="cairo-context.html#CAIRO-ANTIALIAS-SUBPIXEL--CAPS"/>
+    <keyword type="constant" name="CAIRO_FILL_RULE_WINDING" link="cairo-context.html#CAIRO-FILL-RULE-WINDING--CAPS"/>
+    <keyword type="constant" name="CAIRO_FILL_RULE_EVEN_ODD" link="cairo-context.html#CAIRO-FILL-RULE-EVEN-ODD--CAPS"/>
+    <keyword type="constant" name="CAIRO_LINE_CAP_BUTT" link="cairo-context.html#CAIRO-LINE-CAP-BUTT--CAPS"/>
+    <keyword type="constant" name="CAIRO_LINE_CAP_ROUND" link="cairo-context.html#CAIRO-LINE-CAP-ROUND--CAPS"/>
+    <keyword type="constant" name="CAIRO_LINE_CAP_SQUARE" link="cairo-context.html#CAIRO-LINE-CAP-SQUARE--CAPS"/>
+    <keyword type="constant" name="CAIRO_LINE_JOIN_MITER" link="cairo-context.html#CAIRO-LINE-JOIN-MITER--CAPS"/>
+    <keyword type="constant" name="CAIRO_LINE_JOIN_ROUND" link="cairo-context.html#CAIRO-LINE-JOIN-ROUND--CAPS"/>
+    <keyword type="constant" name="CAIRO_LINE_JOIN_BEVEL" link="cairo-context.html#CAIRO-LINE-JOIN-BEVEL--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_CLEAR" link="cairo-context.html#CAIRO-OPERATOR-CLEAR--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_SOURCE" link="cairo-context.html#CAIRO-OPERATOR-SOURCE--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_OVER" link="cairo-context.html#CAIRO-OPERATOR-OVER--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_IN" link="cairo-context.html#CAIRO-OPERATOR-IN--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_OUT" link="cairo-context.html#CAIRO-OPERATOR-OUT--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_ATOP" link="cairo-context.html#CAIRO-OPERATOR-ATOP--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_DEST" link="cairo-context.html#CAIRO-OPERATOR-DEST--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_DEST_OVER" link="cairo-context.html#CAIRO-OPERATOR-DEST-OVER--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_DEST_IN" link="cairo-context.html#CAIRO-OPERATOR-DEST-IN--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_DEST_OUT" link="cairo-context.html#CAIRO-OPERATOR-DEST-OUT--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_DEST_ATOP" link="cairo-context.html#CAIRO-OPERATOR-DEST-ATOP--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_XOR" link="cairo-context.html#CAIRO-OPERATOR-XOR--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_ADD" link="cairo-context.html#CAIRO-OPERATOR-ADD--CAPS"/>
+    <keyword type="constant" name="CAIRO_OPERATOR_SATURATE" link="cairo-context.html#CAIRO-OPERATOR-SATURATE--CAPS"/>
+    <keyword type="constant" name="CAIRO_PATH_MOVE_TO" link="cairo-paths.html#CAIRO-PATH-MOVE-TO--CAPS"/>
+    <keyword type="constant" name="CAIRO_PATH_LINE_TO" link="cairo-paths.html#CAIRO-PATH-LINE-TO--CAPS"/>
+    <keyword type="constant" name="CAIRO_PATH_CURVE_TO" link="cairo-paths.html#CAIRO-PATH-CURVE-TO--CAPS"/>
+    <keyword type="constant" name="CAIRO_PATH_CLOSE_PATH" link="cairo-paths.html#CAIRO-PATH-CLOSE-PATH--CAPS"/>
+    <keyword type="constant" name="CAIRO_EXTEND_NONE" link="cairo-pattern.html#CAIRO-EXTEND-NONE--CAPS"/>
+    <keyword type="constant" name="CAIRO_EXTEND_REPEAT" link="cairo-pattern.html#CAIRO-EXTEND-REPEAT--CAPS"/>
+    <keyword type="constant" name="CAIRO_EXTEND_REFLECT" link="cairo-pattern.html#CAIRO-EXTEND-REFLECT--CAPS"/>
+    <keyword type="constant" name="CAIRO_EXTEND_PAD" link="cairo-pattern.html#CAIRO-EXTEND-PAD--CAPS"/>
+    <keyword type="constant" name="CAIRO_FILTER_FAST" link="cairo-pattern.html#CAIRO-FILTER-FAST--CAPS"/>
+    <keyword type="constant" name="CAIRO_FILTER_GOOD" link="cairo-pattern.html#CAIRO-FILTER-GOOD--CAPS"/>
+    <keyword type="constant" name="CAIRO_FILTER_BEST" link="cairo-pattern.html#CAIRO-FILTER-BEST--CAPS"/>
+    <keyword type="constant" name="CAIRO_FILTER_NEAREST" link="cairo-pattern.html#CAIRO-FILTER-NEAREST--CAPS"/>
+    <keyword type="constant" name="CAIRO_FILTER_BILINEAR" link="cairo-pattern.html#CAIRO-FILTER-BILINEAR--CAPS"/>
+    <keyword type="constant" name="CAIRO_FILTER_GAUSSIAN" link="cairo-pattern.html#CAIRO-FILTER-GAUSSIAN--CAPS"/>
+    <keyword type="constant" name="CAIRO_PATTERN_TYPE_SOLID" link="cairo-pattern.html#CAIRO-PATTERN-TYPE-SOLID--CAPS"/>
+    <keyword type="constant" name="CAIRO_PATTERN_TYPE_SURFACE" link="cairo-pattern.html#CAIRO-PATTERN-TYPE-SURFACE--CAPS"/>
+    <keyword type="constant" name="CAIRO_PATTERN_TYPE_LINEAR" link="cairo-pattern.html#CAIRO-PATTERN-TYPE-LINEAR--CAPS"/>
+    <keyword type="constant" name="CAIRO_PATTERN_TYPE_RADIAL" link="cairo-pattern.html#CAIRO-PATTERN-TYPE-RADIAL--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_SLANT_NORMAL" link="cairo-text.html#CAIRO-FONT-SLANT-NORMAL--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_SLANT_ITALIC" link="cairo-text.html#CAIRO-FONT-SLANT-ITALIC--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_SLANT_OBLIQUE" link="cairo-text.html#CAIRO-FONT-SLANT-OBLIQUE--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_WEIGHT_NORMAL" link="cairo-text.html#CAIRO-FONT-WEIGHT-NORMAL--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_WEIGHT_BOLD" link="cairo-text.html#CAIRO-FONT-WEIGHT-BOLD--CAPS"/>
+    <keyword type="constant" name="CAIRO_TEXT_CLUSTER_FLAG_BACKWARD" link="cairo-text.html#CAIRO-TEXT-CLUSTER-FLAG-BACKWARD--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_TYPE_TOY" link="cairo-font-face.html#CAIRO-FONT-TYPE-TOY--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_TYPE_FT" link="cairo-font-face.html#CAIRO-FONT-TYPE-FT--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_TYPE_WIN32" link="cairo-font-face.html#CAIRO-FONT-TYPE-WIN32--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_TYPE_QUARTZ" link="cairo-font-face.html#CAIRO-FONT-TYPE-QUARTZ--CAPS"/>
+    <keyword type="constant" name="CAIRO_FONT_TYPE_USER" link="cairo-font-face.html#CAIRO-FONT-TYPE-USER--CAPS"/>
+    <keyword type="constant" name="CAIRO_SUBPIXEL_ORDER_DEFAULT" link="cairo-font-options.html#CAIRO-SUBPIXEL-ORDER-DEFAULT--CAPS"/>
+    <keyword type="constant" name="CAIRO_SUBPIXEL_ORDER_RGB" link="cairo-font-options.html#CAIRO-SUBPIXEL-ORDER-RGB--CAPS"/>
+    <keyword type="constant" name="CAIRO_SUBPIXEL_ORDER_BGR" link="cairo-font-options.html#CAIRO-SUBPIXEL-ORDER-BGR--CAPS"/>
+    <keyword type="constant" name="CAIRO_SUBPIXEL_ORDER_VRGB" link="cairo-font-options.html#CAIRO-SUBPIXEL-ORDER-VRGB--CAPS"/>
+    <keyword type="constant" name="CAIRO_SUBPIXEL_ORDER_VBGR" link="cairo-font-options.html#CAIRO-SUBPIXEL-ORDER-VBGR--CAPS"/>
+    <keyword type="constant" name="CAIRO_HINT_STYLE_DEFAULT" link="cairo-font-options.html#CAIRO-HINT-STYLE-DEFAULT--CAPS"/>
+    <keyword type="constant" name="CAIRO_HINT_STYLE_NONE" link="cairo-font-options.html#CAIRO-HINT-STYLE-NONE--CAPS"/>
+    <keyword type="constant" name="CAIRO_HINT_STYLE_SLIGHT" link="cairo-font-options.html#CAIRO-HINT-STYLE-SLIGHT--CAPS"/>
+    <keyword type="constant" name="CAIRO_HINT_STYLE_MEDIUM" link="cairo-font-options.html#CAIRO-HINT-STYLE-MEDIUM--CAPS"/>
+    <keyword type="constant" name="CAIRO_HINT_STYLE_FULL" link="cairo-font-options.html#CAIRO-HINT-STYLE-FULL--CAPS"/>
+    <keyword type="constant" name="CAIRO_HINT_METRICS_DEFAULT" link="cairo-font-options.html#CAIRO-HINT-METRICS-DEFAULT--CAPS"/>
+    <keyword type="constant" name="CAIRO_HINT_METRICS_OFF" link="cairo-font-options.html#CAIRO-HINT-METRICS-OFF--CAPS"/>
+    <keyword type="constant" name="CAIRO_HINT_METRICS_ON" link="cairo-font-options.html#CAIRO-HINT-METRICS-ON--CAPS"/>
+    <keyword type="constant" name="CAIRO_CONTENT_COLOR" link="cairo-surface.html#CAIRO-CONTENT-COLOR--CAPS"/>
+    <keyword type="constant" name="CAIRO_CONTENT_ALPHA" link="cairo-surface.html#CAIRO-CONTENT-ALPHA--CAPS"/>
+    <keyword type="constant" name="CAIRO_CONTENT_COLOR_ALPHA" link="cairo-surface.html#CAIRO-CONTENT-COLOR-ALPHA--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_IMAGE" link="cairo-surface.html#CAIRO-SURFACE-TYPE-IMAGE--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_PDF" link="cairo-surface.html#CAIRO-SURFACE-TYPE-PDF--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_PS" link="cairo-surface.html#CAIRO-SURFACE-TYPE-PS--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_XLIB" link="cairo-surface.html#CAIRO-SURFACE-TYPE-XLIB--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_XCB" link="cairo-surface.html#CAIRO-SURFACE-TYPE-XCB--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_GLITZ" link="cairo-surface.html#CAIRO-SURFACE-TYPE-GLITZ--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_QUARTZ" link="cairo-surface.html#CAIRO-SURFACE-TYPE-QUARTZ--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_WIN32" link="cairo-surface.html#CAIRO-SURFACE-TYPE-WIN32--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_BEOS" link="cairo-surface.html#CAIRO-SURFACE-TYPE-BEOS--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_DIRECTFB" link="cairo-surface.html#CAIRO-SURFACE-TYPE-DIRECTFB--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_SVG" link="cairo-surface.html#CAIRO-SURFACE-TYPE-SVG--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_OS2" link="cairo-surface.html#CAIRO-SURFACE-TYPE-OS2--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_WIN32_PRINTING" link="cairo-surface.html#CAIRO-SURFACE-TYPE-WIN32-PRINTING--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_QUARTZ_IMAGE" link="cairo-surface.html#CAIRO-SURFACE-TYPE-QUARTZ-IMAGE--CAPS"/>
+    <keyword type="constant" name="CAIRO_SURFACE_TYPE_SCRIPT" link="cairo-surface.html#CAIRO-SURFACE-TYPE-SCRIPT--CAPS"/>
+    <keyword type="constant" name="CAIRO_FORMAT_ARGB32" link="cairo-image-surface.html#CAIRO-FORMAT-ARGB32--CAPS"/>
+    <keyword type="constant" name="CAIRO_FORMAT_RGB24" link="cairo-image-surface.html#CAIRO-FORMAT-RGB24--CAPS"/>
+    <keyword type="constant" name="CAIRO_FORMAT_A8" link="cairo-image-surface.html#CAIRO-FORMAT-A8--CAPS"/>
+    <keyword type="constant" name="CAIRO_FORMAT_A1" link="cairo-image-surface.html#CAIRO-FORMAT-A1--CAPS"/>
+    <keyword type="constant" name="CAIRO_PDF_VERSION_1_4" link="cairo-pdf-surface.html#CAIRO-PDF-VERSION-1-4--CAPS"/>
+    <keyword type="constant" name="CAIRO_PDF_VERSION_1_5" link="cairo-pdf-surface.html#CAIRO-PDF-VERSION-1-5--CAPS"/>
+    <keyword type="constant" name="CAIRO_PS_LEVEL_2" link="cairo-ps-surface.html#CAIRO-PS-LEVEL-2--CAPS"/>
+    <keyword type="constant" name="CAIRO_PS_LEVEL_3" link="cairo-ps-surface.html#CAIRO-PS-LEVEL-3--CAPS"/>
+    <keyword type="constant" name="CAIRO_SVG_VERSION_1_1" link="cairo-svg-surface.html#CAIRO-SVG-VERSION-1-1--CAPS"/>
+    <keyword type="constant" name="CAIRO_SVG_VERSION_1_2" link="cairo-svg-surface.html#CAIRO-SVG-VERSION-1-2--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_SUCCESS" link="cairo-error-status.html#CAIRO-STATUS-SUCCESS--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_NO_MEMORY" link="cairo-error-status.html#CAIRO-STATUS-NO-MEMORY--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_RESTORE" link="cairo-error-status.html#CAIRO-STATUS-INVALID-RESTORE--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_POP_GROUP" link="cairo-error-status.html#CAIRO-STATUS-INVALID-POP-GROUP--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_NO_CURRENT_POINT" link="cairo-error-status.html#CAIRO-STATUS-NO-CURRENT-POINT--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_MATRIX" link="cairo-error-status.html#CAIRO-STATUS-INVALID-MATRIX--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_STATUS" link="cairo-error-status.html#CAIRO-STATUS-INVALID-STATUS--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_NULL_POINTER" link="cairo-error-status.html#CAIRO-STATUS-NULL-POINTER--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_STRING" link="cairo-error-status.html#CAIRO-STATUS-INVALID-STRING--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_PATH_DATA" link="cairo-error-status.html#CAIRO-STATUS-INVALID-PATH-DATA--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_READ_ERROR" link="cairo-error-status.html#CAIRO-STATUS-READ-ERROR--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_WRITE_ERROR" link="cairo-error-status.html#CAIRO-STATUS-WRITE-ERROR--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_SURFACE_FINISHED" link="cairo-error-status.html#CAIRO-STATUS-SURFACE-FINISHED--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_SURFACE_TYPE_MISMATCH" link="cairo-error-status.html#CAIRO-STATUS-SURFACE-TYPE-MISMATCH--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_PATTERN_TYPE_MISMATCH" link="cairo-error-status.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_CONTENT" link="cairo-error-status.html#CAIRO-STATUS-INVALID-CONTENT--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_FORMAT" link="cairo-error-status.html#CAIRO-STATUS-INVALID-FORMAT--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_VISUAL" link="cairo-error-status.html#CAIRO-STATUS-INVALID-VISUAL--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_FILE_NOT_FOUND" link="cairo-error-status.html#CAIRO-STATUS-FILE-NOT-FOUND--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_DASH" link="cairo-error-status.html#CAIRO-STATUS-INVALID-DASH--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_DSC_COMMENT" link="cairo-error-status.html#CAIRO-STATUS-INVALID-DSC-COMMENT--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_INDEX" link="cairo-error-status.html#CAIRO-STATUS-INVALID-INDEX--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_CLIP_NOT_REPRESENTABLE" link="cairo-error-status.html#CAIRO-STATUS-CLIP-NOT-REPRESENTABLE--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_TEMP_FILE_ERROR" link="cairo-error-status.html#CAIRO-STATUS-TEMP-FILE-ERROR--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_STRIDE" link="cairo-error-status.html#CAIRO-STATUS-INVALID-STRIDE--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_FONT_TYPE_MISMATCH" link="cairo-error-status.html#CAIRO-STATUS-FONT-TYPE-MISMATCH--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_USER_FONT_IMMUTABLE" link="cairo-error-status.html#CAIRO-STATUS-USER-FONT-IMMUTABLE--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_USER_FONT_ERROR" link="cairo-error-status.html#CAIRO-STATUS-USER-FONT-ERROR--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_NEGATIVE_COUNT" link="cairo-error-status.html#CAIRO-STATUS-NEGATIVE-COUNT--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_CLUSTERS" link="cairo-error-status.html#CAIRO-STATUS-INVALID-CLUSTERS--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_SLANT" link="cairo-error-status.html#CAIRO-STATUS-INVALID-SLANT--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_WEIGHT" link="cairo-error-status.html#CAIRO-STATUS-INVALID-WEIGHT--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_INVALID_SIZE" link="cairo-error-status.html#CAIRO-STATUS-INVALID-SIZE--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED" link="cairo-error-status.html#CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"/>
+    <keyword type="constant" name="CAIRO_STATUS_LAST_STATUS" link="cairo-error-status.html#CAIRO-STATUS-LAST-STATUS--CAPS"/>
   </functions>
 </book>
diff --git a/doc/public/html/index-all.html b/doc/public/html/index-all.html
index fd2835f..bd8531a 100644
--- a/doc/public/html/index-all.html
+++ b/doc/public/html/index-all.html
@@ -215,6 +215,8 @@
 </dt>
 <dt>cairo_has_current_point, <a class="indexterm" href="cairo-paths.html#cairo-has-current-point">cairo_has_current_point ()</a>
 </dt>
+<dt>CAIRO_HAS_FC_FONT, <a class="indexterm" href="cairo-ft-font.html#CAIRO-HAS-FC-FONT--CAPS">CAIRO_HAS_FC_FONT</a>
+</dt>
 <dt>CAIRO_HAS_FT_FONT, <a class="indexterm" href="cairo-ft-font.html#CAIRO-HAS-FT-FONT--CAPS">CAIRO_HAS_FT_FONT</a>
 </dt>
 <dt>CAIRO_HAS_IMAGE_SURFACE, <a class="indexterm" href="cairo-image-surface.html#CAIRO-HAS-IMAGE-SURFACE--CAPS">CAIRO_HAS_IMAGE_SURFACE</a>
@@ -303,6 +305,12 @@
 </dt>
 <dt>cairo_matrix_translate, <a class="indexterm" href="cairo-matrix.html#cairo-matrix-translate">cairo_matrix_translate ()</a>
 </dt>
+<dt>CAIRO_MIME_TYPE_JP2, <a class="indexterm" href="cairo-surface.html#CAIRO-MIME-TYPE-JP2--CAPS">CAIRO_MIME_TYPE_JP2</a>
+</dt>
+<dt>CAIRO_MIME_TYPE_JPEG, <a class="indexterm" href="cairo-surface.html#CAIRO-MIME-TYPE-JPEG--CAPS">CAIRO_MIME_TYPE_JPEG</a>
+</dt>
+<dt>CAIRO_MIME_TYPE_PNG, <a class="indexterm" href="cairo-surface.html#CAIRO-MIME-TYPE-PNG--CAPS">CAIRO_MIME_TYPE_PNG</a>
+</dt>
 <dt>cairo_move_to, <a class="indexterm" href="cairo-paths.html#cairo-move-to">cairo_move_to ()</a>
 </dt>
 <dt>cairo_new_path, <a class="indexterm" href="cairo-paths.html#cairo-new-path">cairo_new_path ()</a>
@@ -381,12 +389,20 @@
 </dt>
 <dt>cairo_pattern_type_t, <a class="indexterm" href="cairo-pattern.html#cairo-pattern-type-t">enum cairo_pattern_type_t</a>
 </dt>
+<dt>cairo_pdf_get_versions, <a class="indexterm" href="cairo-pdf-surface.html#cairo-pdf-get-versions">cairo_pdf_get_versions ()</a>
+</dt>
 <dt>cairo_pdf_surface_create, <a class="indexterm" href="cairo-pdf-surface.html#cairo-pdf-surface-create">cairo_pdf_surface_create ()</a>
 </dt>
 <dt>cairo_pdf_surface_create_for_stream, <a class="indexterm" href="cairo-pdf-surface.html#cairo-pdf-surface-create-for-stream">cairo_pdf_surface_create_for_stream ()</a>
 </dt>
+<dt>cairo_pdf_surface_restrict_to_version, <a class="indexterm" href="cairo-pdf-surface.html#cairo-pdf-surface-restrict-to-version">cairo_pdf_surface_restrict_to_version ()</a>
+</dt>
 <dt>cairo_pdf_surface_set_size, <a class="indexterm" href="cairo-pdf-surface.html#cairo-pdf-surface-set-size">cairo_pdf_surface_set_size ()</a>
 </dt>
+<dt>cairo_pdf_version_t, <a class="indexterm" href="cairo-pdf-surface.html#cairo-pdf-version-t">enum cairo_pdf_version_t</a>
+</dt>
+<dt>cairo_pdf_version_to_string, <a class="indexterm" href="cairo-pdf-surface.html#cairo-pdf-version-to-string">cairo_pdf_version_to_string ()</a>
+</dt>
 <dt>cairo_pop_group, <a class="indexterm" href="cairo-context.html#cairo-pop-group">cairo_pop_group ()</a>
 </dt>
 <dt>cairo_pop_group_to_source, <a class="indexterm" href="cairo-context.html#cairo-pop-group-to-source">cairo_pop_group_to_source ()</a>
@@ -575,6 +591,8 @@
 </dt>
 <dt>cairo_surface_get_font_options, <a class="indexterm" href="cairo-surface.html#cairo-surface-get-font-options">cairo_surface_get_font_options ()</a>
 </dt>
+<dt>cairo_surface_get_mime_data, <a class="indexterm" href="cairo-surface.html#cairo-surface-get-mime-data">cairo_surface_get_mime_data ()</a>
+</dt>
 <dt>cairo_surface_get_reference_count, <a class="indexterm" href="cairo-surface.html#cairo-surface-get-reference-count">cairo_surface_get_reference_count ()</a>
 </dt>
 <dt>cairo_surface_get_type, <a class="indexterm" href="cairo-surface.html#cairo-surface-get-type">cairo_surface_get_type ()</a>
@@ -593,6 +611,8 @@
 </dt>
 <dt>cairo_surface_set_fallback_resolution, <a class="indexterm" href="cairo-surface.html#cairo-surface-set-fallback-resolution">cairo_surface_set_fallback_resolution ()</a>
 </dt>
+<dt>cairo_surface_set_mime_data, <a class="indexterm" href="cairo-surface.html#cairo-surface-set-mime-data">cairo_surface_set_mime_data ()</a>
+</dt>
 <dt>cairo_surface_set_user_data, <a class="indexterm" href="cairo-surface.html#cairo-surface-set-user-data">cairo_surface_set_user_data ()</a>
 </dt>
 <dt>cairo_surface_show_page, <a class="indexterm" href="cairo-surface.html#cairo-surface-show-page">cairo_surface_show_page ()</a>
diff --git a/doc/public/html/index.html b/doc/public/html/index.html
index 5bcdba2..52b3716 100644
--- a/doc/public/html/index.html
+++ b/doc/public/html/index.html
@@ -24,7 +24,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Cairo: A Vector Graphics Library</p></th></tr></table></div>
-<div><p class="releaseinfo">for Cairo 1.8.8
+<div><p class="releaseinfo">for Cairo 1.9.2
 </p></div>
 </div>
 <hr>
diff --git a/doc/public/html/index.sgml b/doc/public/html/index.sgml
index 40c5174..0cde140 100644
--- a/doc/public/html/index.sgml
+++ b/doc/public/html/index.sgml
@@ -251,6 +251,7 @@
 <ANCHOR id="cairo-ft-font.description" href="cairo/cairo-ft-font.html#cairo-ft-font.description">
 <ANCHOR id="cairo-ft-font.details" href="cairo/cairo-ft-font.html#cairo-ft-font.details">
 <ANCHOR id="CAIRO-HAS-FT-FONT--CAPS" href="cairo/cairo-ft-font.html#CAIRO-HAS-FT-FONT--CAPS">
+<ANCHOR id="CAIRO-HAS-FC-FONT--CAPS" href="cairo/cairo-ft-font.html#CAIRO-HAS-FC-FONT--CAPS">
 <ANCHOR id="cairo-ft-font-face-create-for-ft-face" href="cairo/cairo-ft-font.html#cairo-ft-font-face-create-for-ft-face">
 <ANCHOR id="cairo-ft-font-face-create-for-pattern" href="cairo/cairo-ft-font.html#cairo-ft-font-face-create-for-pattern">
 <ANCHOR id="cairo-ft-font-options-substitute" href="cairo/cairo-ft-font.html#cairo-ft-font-options-substitute">
@@ -301,6 +302,9 @@
 <ANCHOR id="cairo-surface.synopsis" href="cairo/cairo-surface.html#cairo-surface.synopsis">
 <ANCHOR id="cairo-surface.description" href="cairo/cairo-surface.html#cairo-surface.description">
 <ANCHOR id="cairo-surface.details" href="cairo/cairo-surface.html#cairo-surface.details">
+<ANCHOR id="CAIRO-MIME-TYPE-JP2--CAPS" href="cairo/cairo-surface.html#CAIRO-MIME-TYPE-JP2--CAPS">
+<ANCHOR id="CAIRO-MIME-TYPE-JPEG--CAPS" href="cairo/cairo-surface.html#CAIRO-MIME-TYPE-JPEG--CAPS">
+<ANCHOR id="CAIRO-MIME-TYPE-PNG--CAPS" href="cairo/cairo-surface.html#CAIRO-MIME-TYPE-PNG--CAPS">
 <ANCHOR id="cairo-surface-t" href="cairo/cairo-surface.html#cairo-surface-t">
 <ANCHOR id="cairo-content-t" href="cairo/cairo-surface.html#cairo-content-t">
 <ANCHOR id="cairo-surface-create-similar" href="cairo/cairo-surface.html#cairo-surface-create-similar">
@@ -325,6 +329,8 @@
 <ANCHOR id="cairo-surface-copy-page" href="cairo/cairo-surface.html#cairo-surface-copy-page">
 <ANCHOR id="cairo-surface-show-page" href="cairo/cairo-surface.html#cairo-surface-show-page">
 <ANCHOR id="cairo-surface-has-show-text-glyphs" href="cairo/cairo-surface.html#cairo-surface-has-show-text-glyphs">
+<ANCHOR id="cairo-surface-set-mime-data" href="cairo/cairo-surface.html#cairo-surface-set-mime-data">
+<ANCHOR id="cairo-surface-get-mime-data" href="cairo/cairo-surface.html#cairo-surface-get-mime-data">
 <ANCHOR id="cairo-surface.see-also" href="cairo/cairo-surface.html#cairo-surface.see-also">
 <ANCHOR id="cairo-image-surface" href="cairo/cairo-image-surface.html">
 <ANCHOR id="cairo-image-surface.synopsis" href="cairo/cairo-image-surface.html#cairo-image-surface.synopsis">
@@ -348,6 +354,10 @@
 <ANCHOR id="CAIRO-HAS-PDF-SURFACE--CAPS" href="cairo/cairo-pdf-surface.html#CAIRO-HAS-PDF-SURFACE--CAPS">
 <ANCHOR id="cairo-pdf-surface-create" href="cairo/cairo-pdf-surface.html#cairo-pdf-surface-create">
 <ANCHOR id="cairo-pdf-surface-create-for-stream" href="cairo/cairo-pdf-surface.html#cairo-pdf-surface-create-for-stream">
+<ANCHOR id="cairo-pdf-surface-restrict-to-version" href="cairo/cairo-pdf-surface.html#cairo-pdf-surface-restrict-to-version">
+<ANCHOR id="cairo-pdf-version-t" href="cairo/cairo-pdf-surface.html#cairo-pdf-version-t">
+<ANCHOR id="cairo-pdf-get-versions" href="cairo/cairo-pdf-surface.html#cairo-pdf-get-versions">
+<ANCHOR id="cairo-pdf-version-to-string" href="cairo/cairo-pdf-surface.html#cairo-pdf-version-to-string">
 <ANCHOR id="cairo-pdf-surface-set-size" href="cairo/cairo-pdf-surface.html#cairo-pdf-surface-set-size">
 <ANCHOR id="cairo-pdf-surface.see-also" href="cairo/cairo-pdf-surface.html#cairo-pdf-surface.see-also">
 <ANCHOR id="cairo-png-functions" href="cairo/cairo-png-functions.html">
diff --git a/doc/public/tmpl/cairo-ft.sgml b/doc/public/tmpl/cairo-ft.sgml
index 68a3fd4..307d632 100644
--- a/doc/public/tmpl/cairo-ft.sgml
+++ b/doc/public/tmpl/cairo-ft.sgml
@@ -28,6 +28,15 @@ This macro can be used to conditionally compile backend-specific code.
 
 
 
+<!-- ##### MACRO CAIRO_HAS_FC_FONT ##### -->
+<para>
+Defined if the Fontconfig-specific functions of the FreeType font backend
+are available.
+This macro can be used to conditionally compile backend-specific code.
+</para>
+
+
+
 <!-- ##### FUNCTION cairo_ft_font_face_create_for_ft_face ##### -->
 <para>
 
diff --git a/doc/public/tmpl/cairo-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml
index fabb8d7..4174109 100644
--- a/doc/public/tmpl/cairo-pdf.sgml
+++ b/doc/public/tmpl/cairo-pdf.sgml
@@ -51,6 +51,41 @@ This macro can be used to conditionally compile backend-specific code.
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_pdf_surface_restrict_to_version ##### -->
+<para>
+
+</para>
+
+@surface: 
+@version: 
+
+
+<!-- ##### ENUM cairo_pdf_version_t ##### -->
+<para>
+
+</para>
+
+@CAIRO_PDF_VERSION_1_4: 
+@CAIRO_PDF_VERSION_1_5: 
+
+<!-- ##### FUNCTION cairo_pdf_get_versions ##### -->
+<para>
+
+</para>
+
+@versions: 
+@num_versions: 
+
+
+<!-- ##### FUNCTION cairo_pdf_version_to_string ##### -->
+<para>
+
+</para>
+
+@version: 
+@Returns: 
+
+
 <!-- ##### FUNCTION cairo_pdf_surface_set_size ##### -->
 <para>
 
diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml
index fcc17a9..aed8aa6 100644
--- a/doc/public/tmpl/cairo-status.sgml
+++ b/doc/public/tmpl/cairo-status.sgml
@@ -70,6 +70,9 @@ code is required before or after each individual cairo function call.
 @CAIRO_STATUS_INVALID_CLUSTERS: 
 @CAIRO_STATUS_INVALID_SLANT: 
 @CAIRO_STATUS_INVALID_WEIGHT: 
+@CAIRO_STATUS_INVALID_SIZE: 
+@CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED: 
+@CAIRO_STATUS_LAST_STATUS: 
 
 <!-- ##### FUNCTION cairo_status_to_string ##### -->
 <para>
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index 6b6c2f4..f7df829 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -27,6 +27,27 @@ cairo_<emphasis>backend</emphasis>_surface_create().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### MACRO CAIRO_MIME_TYPE_JP2 ##### -->
+<para>
+The Joint Photographic Experts Group (JPEG) 2000 image coding standard (ISO/IEC 15444-1). Since 1.10
+</para>
+
+
+
+<!-- ##### MACRO CAIRO_MIME_TYPE_JPEG ##### -->
+<para>
+The Joint Photographic Experts Group (JPEG) image coding standard (ISO/IEC 10918-1). Since 1.10
+</para>
+
+
+
+<!-- ##### MACRO CAIRO_MIME_TYPE_PNG ##### -->
+<para>
+The Portable Network Graphics image file format (ISO/IEC 15948). Since 1.10
+</para>
+
+
+
 <!-- ##### TYPEDEF cairo_surface_t ##### -->
 <para>
 
@@ -193,6 +214,7 @@ cairo_<emphasis>backend</emphasis>_surface_create().
 @CAIRO_SURFACE_TYPE_OS2: 
 @CAIRO_SURFACE_TYPE_WIN32_PRINTING: 
 @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: 
+@CAIRO_SURFACE_TYPE_SCRIPT: 
 
 <!-- ##### FUNCTION cairo_surface_get_type ##### -->
 <para>
@@ -259,3 +281,28 @@ cairo_<emphasis>backend</emphasis>_surface_create().
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_surface_set_mime_data ##### -->
+<para>
+
+</para>
+
+@surface: 
+@mime_type: 
+@data: 
+@length: 
+@destroy: 
+@closure: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_surface_get_mime_data ##### -->
+<para>
+
+</para>
+
+@surface: 
+@mime_type: 
+@data: 
+@length: 
+
+
diff --git a/doc/public/version.xml b/doc/public/version.xml
index 1790d35..8fdcf38 100644
--- a/doc/public/version.xml
+++ b/doc/public/version.xml
@@ -1 +1 @@
-1.8.8
+1.9.2
diff --git a/doc/public/xml/api-index-1.10.xml b/doc/public/xml/api-index-1.10.xml
new file mode 100644
index 0000000..ab22a8b
--- /dev/null
+++ b/doc/public/xml/api-index-1.10.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?> 
+<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
+<indexdiv>
+<indexdiv><title>C</title>
+<indexentry><primaryie linkends="cairo-pdf-get-versions"><link linkend="cairo-pdf-get-versions">cairo_pdf_get_versions</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-pdf-surface-restrict-to-version"><link linkend="cairo-pdf-surface-restrict-to-version">cairo_pdf_surface_restrict_to_version</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-pdf-version-to-string"><link linkend="cairo-pdf-version-to-string">cairo_pdf_version_to_string</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-surface-get-mime-data"><link linkend="cairo-surface-get-mime-data">cairo_surface_get_mime_data</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-surface-set-mime-data"><link linkend="cairo-surface-set-mime-data">cairo_surface_set_mime_data</link></primaryie></indexentry>
+</indexdiv>
+</indexdiv>
diff --git a/doc/public/xml/api-index-full.xml b/doc/public/xml/api-index-full.xml
index d75dcc2..5928e22 100644
--- a/doc/public/xml/api-index-full.xml
+++ b/doc/public/xml/api-index-full.xml
@@ -95,6 +95,7 @@
 <indexentry><primaryie linkends="cairo-glyph-path"><link linkend="cairo-glyph-path">cairo_glyph_path</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-glyph-t"><link linkend="cairo-glyph-t">cairo_glyph_t</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-has-current-point"><link linkend="cairo-has-current-point">cairo_has_current_point</link></primaryie></indexentry>
+<indexentry><primaryie linkends="CAIRO-HAS-FC-FONT--CAPS"><link linkend="CAIRO-HAS-FC-FONT--CAPS">CAIRO_HAS_FC_FONT</link></primaryie></indexentry>
 <indexentry><primaryie linkends="CAIRO-HAS-FT-FONT--CAPS"><link linkend="CAIRO-HAS-FT-FONT--CAPS">CAIRO_HAS_FT_FONT</link></primaryie></indexentry>
 <indexentry><primaryie linkends="CAIRO-HAS-IMAGE-SURFACE--CAPS"><link linkend="CAIRO-HAS-IMAGE-SURFACE--CAPS">CAIRO_HAS_IMAGE_SURFACE</link></primaryie></indexentry>
 <indexentry><primaryie linkends="CAIRO-HAS-PDF-SURFACE--CAPS"><link linkend="CAIRO-HAS-PDF-SURFACE--CAPS">CAIRO_HAS_PDF_SURFACE</link></primaryie></indexentry>
@@ -140,6 +141,9 @@
 <indexentry><primaryie linkends="cairo-matrix-transform-distance"><link linkend="cairo-matrix-transform-distance">cairo_matrix_transform_distance</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-matrix-transform-point"><link linkend="cairo-matrix-transform-point">cairo_matrix_transform_point</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-matrix-translate"><link linkend="cairo-matrix-translate">cairo_matrix_translate</link></primaryie></indexentry>
+<indexentry><primaryie linkends="CAIRO-MIME-TYPE-JP2--CAPS"><link linkend="CAIRO-MIME-TYPE-JP2--CAPS">CAIRO_MIME_TYPE_JP2</link></primaryie></indexentry>
+<indexentry><primaryie linkends="CAIRO-MIME-TYPE-JPEG--CAPS"><link linkend="CAIRO-MIME-TYPE-JPEG--CAPS">CAIRO_MIME_TYPE_JPEG</link></primaryie></indexentry>
+<indexentry><primaryie linkends="CAIRO-MIME-TYPE-PNG--CAPS"><link linkend="CAIRO-MIME-TYPE-PNG--CAPS">CAIRO_MIME_TYPE_PNG</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-move-to"><link linkend="cairo-move-to">cairo_move_to</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-new-path"><link linkend="cairo-new-path">cairo_new_path</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-new-sub-path"><link linkend="cairo-new-sub-path">cairo_new_sub_path</link></primaryie></indexentry>
@@ -179,9 +183,13 @@
 <indexentry><primaryie linkends="cairo-pattern-status"><link linkend="cairo-pattern-status">cairo_pattern_status</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-pattern-t"><link linkend="cairo-pattern-t">cairo_pattern_t</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-pattern-type-t"><link linkend="cairo-pattern-type-t">cairo_pattern_type_t</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-pdf-get-versions"><link linkend="cairo-pdf-get-versions">cairo_pdf_get_versions</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-pdf-surface-create"><link linkend="cairo-pdf-surface-create">cairo_pdf_surface_create</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-pdf-surface-create-for-stream"><link linkend="cairo-pdf-surface-create-for-stream">cairo_pdf_surface_create_for_stream</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-pdf-surface-restrict-to-version"><link linkend="cairo-pdf-surface-restrict-to-version">cairo_pdf_surface_restrict_to_version</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-pdf-surface-set-size"><link linkend="cairo-pdf-surface-set-size">cairo_pdf_surface_set_size</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-pdf-version-t"><link linkend="cairo-pdf-version-t">cairo_pdf_version_t</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-pdf-version-to-string"><link linkend="cairo-pdf-version-to-string">cairo_pdf_version_to_string</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-pop-group"><link linkend="cairo-pop-group">cairo_pop_group</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-pop-group-to-source"><link linkend="cairo-pop-group-to-source">cairo_pop_group_to_source</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-ps-get-levels"><link linkend="cairo-ps-get-levels">cairo_ps_get_levels</link></primaryie></indexentry>
@@ -276,6 +284,7 @@
 <indexentry><primaryie linkends="cairo-surface-get-device-offset"><link linkend="cairo-surface-get-device-offset">cairo_surface_get_device_offset</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-get-fallback-resolution"><link linkend="cairo-surface-get-fallback-resolution">cairo_surface_get_fallback_resolution</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-get-font-options"><link linkend="cairo-surface-get-font-options">cairo_surface_get_font_options</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-surface-get-mime-data"><link linkend="cairo-surface-get-mime-data">cairo_surface_get_mime_data</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-get-reference-count"><link linkend="cairo-surface-get-reference-count">cairo_surface_get_reference_count</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-get-type"><link linkend="cairo-surface-get-type">cairo_surface_get_type</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-get-user-data"><link linkend="cairo-surface-get-user-data">cairo_surface_get_user_data</link></primaryie></indexentry>
@@ -285,6 +294,7 @@
 <indexentry><primaryie linkends="cairo-surface-reference"><link linkend="cairo-surface-reference">cairo_surface_reference</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-set-device-offset"><link linkend="cairo-surface-set-device-offset">cairo_surface_set_device_offset</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-set-fallback-resolution"><link linkend="cairo-surface-set-fallback-resolution">cairo_surface_set_fallback_resolution</link></primaryie></indexentry>
+<indexentry><primaryie linkends="cairo-surface-set-mime-data"><link linkend="cairo-surface-set-mime-data">cairo_surface_set_mime_data</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-set-user-data"><link linkend="cairo-surface-set-user-data">cairo_surface_set_user_data</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-show-page"><link linkend="cairo-surface-show-page">cairo_surface_show_page</link></primaryie></indexentry>
 <indexentry><primaryie linkends="cairo-surface-status"><link linkend="cairo-surface-status">cairo_surface_status</link></primaryie></indexentry>
diff --git a/doc/public/xml/cairo-ft.xml b/doc/public/xml/cairo-ft.xml
index 7b80bea..9b64acf 100644
--- a/doc/public/xml/cairo-ft.xml
+++ b/doc/public/xml/cairo-ft.xml
@@ -20,6 +20,7 @@
 
 <synopsis>
 #define             <link linkend="CAIRO-HAS-FT-FONT--CAPS">CAIRO_HAS_FT_FONT</link>
+#define             <link linkend="CAIRO-HAS-FC-FONT--CAPS">CAIRO_HAS_FC_FONT</link>
 <link linkend="cairo-font-face-t">cairo_font_face_t</link> * <link linkend="cairo-ft-font-face-create-for-ft-face">cairo_ft_font_face_create_for_ft_face</link>
                                                         (<link linkend="FT-Face">FT_Face</link> face,
                                                          <link linkend="int">int</link> load_flags);
@@ -58,6 +59,15 @@ systems, but can be used on other platforms too.
 Defined if the FreeType font backend is available.
 This macro can be used to conditionally compile backend-specific code.
 </para></refsect2>
+<refsect2 id="CAIRO-HAS-FC-FONT--CAPS" role="macro">
+<title>CAIRO_HAS_FC_FONT</title>
+<indexterm zone="CAIRO-HAS-FC-FONT--CAPS"><primary sortas="CAIRO_HAS_FC_FONT">CAIRO_HAS_FC_FONT</primary></indexterm><programlisting>#define CAIRO_HAS_FC_FONT 1
+</programlisting>
+<para>
+Defined if the Fontconfig-specific functions of the FreeType font backend
+are available.
+This macro can be used to conditionally compile backend-specific code.
+</para></refsect2>
 <refsect2 id="cairo-ft-font-face-create-for-ft-face" role="function">
 <title>cairo_ft_font_face_create_for_ft_face ()</title>
 <indexterm zone="cairo-ft-font-face-create-for-ft-face"><primary sortas="cairo_ft_font_face_create_for_ft_face">cairo_ft_font_face_create_for_ft_face</primary></indexterm><programlisting><link linkend="cairo-font-face-t">cairo_font_face_t</link> * cairo_ft_font_face_create_for_ft_face
@@ -137,8 +147,14 @@ appropriately to reflect the options in a <link linkend="cairo-font-options-t"><
 <para>
 The pattern's FC_FT_FACE element is inspected first and if that is set,
 that will be the FreeType font face associated with the returned cairo
-font face.  Otherwise the FC_FILE and FC_INDEX elements of <parameter>pattern</parameter> are
-used to load a font face from file.
+font face.  Otherwise the FC_FILE element is checked.  If it's set,
+that and the value of the FC_INDEX element (defaults to zero) of <parameter>pattern</parameter>
+are used to load a font face from file.
+</para>
+<para>
+If both steps from the previous paragraph fails, <parameter>pattern</parameter> will be passed
+to FcConfigSubstitute, FcDefaultSubstitute, and finally FcFontMatch,
+and the resulting font pattern is used.
 </para>
 <para>
 If the FC_FT_FACE element of <parameter>pattern</parameter> is set, the user is responsible
@@ -149,13 +165,8 @@ the life time of the FT_Face to that of the cairo font-face.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>pattern</parameter>&#160;:</term>
-<listitem><simpara> A fully resolved fontconfig
-  pattern. A pattern can be resolved, by, among other things, calling
-  <link linkend="FcConfigSubstitute"><function>FcConfigSubstitute()</function></link>, <link linkend="FcDefaultSubstitute"><function>FcDefaultSubstitute()</function></link>, then
-  <link linkend="FcFontMatch"><function>FcFontMatch()</function></link>. Cairo will call <link linkend="FcPatternReference"><function>FcPatternReference()</function></link> on this
-  pattern, so you should not further modify the pattern, but you can
-  release your reference to the pattern with <link linkend="FcPatternDestroy"><function>FcPatternDestroy()</function></link> if
-  you no longer need to access it.
+<listitem><simpara> A fontconfig pattern.  Cairo makes a copy of the pattern
+if it needs to.  You are free to modify or free <parameter>pattern</parameter> after this call.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a newly created <link linkend="cairo-font-face-t"><type>cairo_font_face_t</type></link>. Free with
  <link linkend="cairo-font-face-destroy"><function>cairo_font_face_destroy()</function></link> when you are done using it.
@@ -199,7 +210,7 @@ You must be careful when using this function in a library or in a
 threaded application, because freetype's design makes it unsafe to
 call freetype functions simultaneously from multiple threads, (even
 if using distinct FT_Face objects). Because of this, application
-code that acquires an FT_Face object with this call must add it's
+code that acquires an FT_Face object with this call must add its
 own locking to protect any use of that object, (and which also must
 protect any other calls into cairo as almost any cairo function
 might result in a call into the freetype library).</para>
diff --git a/doc/public/xml/cairo-matrix.xml b/doc/public/xml/cairo-matrix.xml
index 6c1b689..34f33a7 100644
--- a/doc/public/xml/cairo-matrix.xml
+++ b/doc/public/xml/cairo-matrix.xml
@@ -317,7 +317,7 @@ direction.
 <title>cairo_matrix_invert ()</title>
 <indexterm zone="cairo-matrix-invert"><primary sortas="cairo_matrix_invert">cairo_matrix_invert</primary></indexterm><programlisting><link linkend="cairo-status-t">cairo_status_t</link>      cairo_matrix_invert                 (<link linkend="cairo-matrix-t">cairo_matrix_t</link> *matrix);</programlisting>
 <para>
-Changes <parameter>matrix</parameter> to be the inverse of it's original value. Not
+Changes <parameter>matrix</parameter> to be the inverse of its original value. Not
 all transformation matrices have inverses; if the matrix
 collapses points together (it is <firstterm>degenerate</firstterm>),
 then it has no inverse and this function will fail.</para>
diff --git a/doc/public/xml/cairo-pdf.xml b/doc/public/xml/cairo-pdf.xml
index ca78822..3fce42e 100644
--- a/doc/public/xml/cairo-pdf.xml
+++ b/doc/public/xml/cairo-pdf.xml
@@ -27,6 +27,13 @@
                                                          <link linkend="void">void</link> *closure,
                                                          <link linkend="double">double</link> width_in_points,
                                                          <link linkend="double">double</link> height_in_points);
+<link linkend="void">void</link>                <link linkend="cairo-pdf-surface-restrict-to-version">cairo_pdf_surface_restrict_to_version</link>
+                                                        (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface,
+                                                         <link linkend="cairo-pdf-version-t">cairo_pdf_version_t</link> version);
+enum                <link linkend="cairo-pdf-version-t">cairo_pdf_version_t</link>;
+<link linkend="void">void</link>                <link linkend="cairo-pdf-get-versions">cairo_pdf_get_versions</link>              (<link linkend="cairo-pdf-version-t">cairo_pdf_version_t</link> const **versions,
+                                                         <link linkend="int">int</link> *num_versions);
+const <link linkend="char">char</link> *        <link linkend="cairo-pdf-version-to-string">cairo_pdf_version_to_string</link>         (<link linkend="cairo-pdf-version-t">cairo_pdf_version_t</link> version);
 <link linkend="void">void</link>                <link linkend="cairo-pdf-surface-set-size">cairo_pdf_surface_set_size</link>          (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface,
                                                          <link linkend="double">double</link> width_in_points,
                                                          <link linkend="double">double</link> height_in_points);
@@ -127,6 +134,87 @@ occurs. You can use <link linkend="cairo-surface-status"><function>cairo_surface
 
 </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 1.2</para></refsect2>
+<refsect2 id="cairo-pdf-surface-restrict-to-version" role="function" condition="since:1.10">
+<title>cairo_pdf_surface_restrict_to_version ()</title>
+<indexterm zone="cairo-pdf-surface-restrict-to-version" role="1.10"><primary sortas="cairo_pdf_surface_restrict_to_version">cairo_pdf_surface_restrict_to_version</primary></indexterm><programlisting><link linkend="void">void</link>                cairo_pdf_surface_restrict_to_version
+                                                        (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface,
+                                                         <link linkend="cairo-pdf-version-t">cairo_pdf_version_t</link> version);</programlisting>
+<para>
+Restricts the generated PDF file to <parameter>version</parameter>. See <link linkend="cairo-pdf-get-versions"><function>cairo_pdf_get_versions()</function></link>
+for a list of available version values that can be used here.
+</para>
+<para>
+This function should only be called before any drawing operations
+have been performed on the given surface. The simplest way to do
+this is to call this function immediately after creating the
+surface.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>surface</parameter>&#160;:</term>
+<listitem><simpara> a PDF <link linkend="cairo-surface-t"><type>cairo_surface_t</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>version</parameter>&#160;:</term>
+<listitem><simpara> PDF version
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 1.10</para></refsect2>
+<refsect2 id="cairo-pdf-version-t" role="enum">
+<title>enum cairo_pdf_version_t</title>
+<indexterm zone="cairo-pdf-version-t"><primary sortas="cairo_pdf_version_t">cairo_pdf_version_t</primary></indexterm><programlisting>typedef enum _cairo_pdf_version {
+    CAIRO_PDF_VERSION_1_4,
+    CAIRO_PDF_VERSION_1_5
+} cairo_pdf_version_t;
+</programlisting>
+<para>
+<link linkend="cairo-pdf-version-t"><type>cairo_pdf_version_t</type></link> is used to describe the version number of the PDF
+specification that a generated PDF file will conform to.
+</para>
+<para>
+Since 1.10</para>
+<para>
+</para><variablelist role="enum">
+<varlistentry id="CAIRO-PDF-VERSION-1-4--CAPS" role="constant">
+<term><literal>CAIRO_PDF_VERSION_1_4</literal></term>
+<listitem><simpara> The version 1.4 of the PDF specification.
+</simpara></listitem>
+</varlistentry>
+<varlistentry id="CAIRO-PDF-VERSION-1-5--CAPS" role="constant">
+<term><literal>CAIRO_PDF_VERSION_1_5</literal></term>
+<listitem><simpara> The version 1.5 of the PDF specification.
+</simpara></listitem>
+</varlistentry>
+</variablelist></refsect2>
+<refsect2 id="cairo-pdf-get-versions" role="function" condition="since:1.10">
+<title>cairo_pdf_get_versions ()</title>
+<indexterm zone="cairo-pdf-get-versions" role="1.10"><primary sortas="cairo_pdf_get_versions">cairo_pdf_get_versions</primary></indexterm><programlisting><link linkend="void">void</link>                cairo_pdf_get_versions              (<link linkend="cairo-pdf-version-t">cairo_pdf_version_t</link> const **versions,
+                                                         <link linkend="int">int</link> *num_versions);</programlisting>
+<para>
+Used to retrieve the list of supported versions. See
+<link linkend="cairo-pdf-surface-restrict-to-version"><function>cairo_pdf_surface_restrict_to_version()</function></link>.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>versions</parameter>&#160;:</term>
+<listitem><simpara> supported version list
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>num_versions</parameter>&#160;:</term>
+<listitem><simpara> list length
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 1.10</para></refsect2>
+<refsect2 id="cairo-pdf-version-to-string" role="function" condition="since:1.10">
+<title>cairo_pdf_version_to_string ()</title>
+<indexterm zone="cairo-pdf-version-to-string" role="1.10"><primary sortas="cairo_pdf_version_to_string">cairo_pdf_version_to_string</primary></indexterm><programlisting>const <link linkend="char">char</link> *        cairo_pdf_version_to_string         (<link linkend="cairo-pdf-version-t">cairo_pdf_version_t</link> version);</programlisting>
+<para>
+Get the string representation of the given <parameter>version</parameter> id. This function
+will return <link linkend="NULL--CAPS"><literal>NULL</literal></link> if <parameter>version</parameter> isn't valid. See <link linkend="cairo-pdf-get-versions"><function>cairo_pdf_get_versions()</function></link>
+for a way to get the list of valid version ids.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>version</parameter>&#160;:</term>
+<listitem><simpara> a version id
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the string associated to given version.
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 1.10</para></refsect2>
 <refsect2 id="cairo-pdf-surface-set-size" role="function" condition="since:1.2">
 <title>cairo_pdf_surface_set_size ()</title>
 <indexterm zone="cairo-pdf-surface-set-size" role="1.2"><primary sortas="cairo_pdf_surface_set_size">cairo_pdf_surface_set_size</primary></indexterm><programlisting><link linkend="void">void</link>                cairo_pdf_surface_set_size          (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface,
diff --git a/doc/public/xml/cairo-quartz-fonts.xml b/doc/public/xml/cairo-quartz-fonts.xml
index 0821384..a18c990 100644
--- a/doc/public/xml/cairo-quartz-fonts.xml
+++ b/doc/public/xml/cairo-quartz-fonts.xml
@@ -48,7 +48,8 @@ implementation of the font backend methods.
 <title role="details.title">Details</title>
 <refsect2 id="CAIRO-HAS-QUARTZ-FONT--CAPS" role="macro">
 <title>CAIRO_HAS_QUARTZ_FONT</title>
-<indexterm zone="CAIRO-HAS-QUARTZ-FONT--CAPS"><primary sortas="CAIRO_HAS_QUARTZ_FONT">CAIRO_HAS_QUARTZ_FONT</primary></indexterm><programlisting>#define             CAIRO_HAS_QUARTZ_FONT</programlisting>
+<indexterm zone="CAIRO-HAS-QUARTZ-FONT--CAPS"><primary sortas="CAIRO_HAS_QUARTZ_FONT">CAIRO_HAS_QUARTZ_FONT</primary></indexterm><programlisting>#define CAIRO_HAS_QUARTZ_FONT 1
+</programlisting>
 <para>
 Defined if the Quartz font backend is available.
 This macro can be used to conditionally compile backend-specific code.
diff --git a/doc/public/xml/cairo-quartz.xml b/doc/public/xml/cairo-quartz.xml
index e31f743..cfe4d90 100644
--- a/doc/public/xml/cairo-quartz.xml
+++ b/doc/public/xml/cairo-quartz.xml
@@ -51,7 +51,8 @@ Apple OS X Quartz rendering system.
 <title role="details.title">Details</title>
 <refsect2 id="CAIRO-HAS-QUARTZ-SURFACE--CAPS" role="macro">
 <title>CAIRO_HAS_QUARTZ_SURFACE</title>
-<indexterm zone="CAIRO-HAS-QUARTZ-SURFACE--CAPS"><primary sortas="CAIRO_HAS_QUARTZ_SURFACE">CAIRO_HAS_QUARTZ_SURFACE</primary></indexterm><programlisting>#define             CAIRO_HAS_QUARTZ_SURFACE</programlisting>
+<indexterm zone="CAIRO-HAS-QUARTZ-SURFACE--CAPS"><primary sortas="CAIRO_HAS_QUARTZ_SURFACE">CAIRO_HAS_QUARTZ_SURFACE</primary></indexterm><programlisting>#define CAIRO_HAS_QUARTZ_SURFACE 1
+</programlisting>
 <para>
 Defined if the Quartz surface backend is available.
 This macro can be used to conditionally compile backend-specific code.
diff --git a/doc/public/xml/cairo-scaled-font.xml b/doc/public/xml/cairo-scaled-font.xml
index fe42830..6440d7d 100644
--- a/doc/public/xml/cairo-scaled-font.xml
+++ b/doc/public/xml/cairo-scaled-font.xml
@@ -581,7 +581,9 @@ set on <parameter>scaled_font</parameter>.
 <title>cairo_scaled_font_get_font_face ()</title>
 <indexterm zone="cairo-scaled-font-get-font-face" role="1.2"><primary sortas="cairo_scaled_font_get_font_face">cairo_scaled_font_get_font_face</primary></indexterm><programlisting><link linkend="cairo-font-face-t">cairo_font_face_t</link> * cairo_scaled_font_get_font_face     (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font);</programlisting>
 <para>
-Gets the font face that this scaled font was created for.</para>
+Gets the font face that this scaled font uses.  This is the
+font face passed to <link linkend="cairo-scaled-font-create"><function>cairo_scaled_font_create()</function></link> if that font face
+was not of type <link linkend="CAIRO-FONT-TYPE-TOY--CAPS"><literal>CAIRO_FONT_TYPE_TOY</literal></link>.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>scaled_font</parameter>&#160;:</term>
@@ -629,7 +631,10 @@ Stores the font matrix with which <parameter>scaled_font</parameter> was created
 <indexterm zone="cairo-scaled-font-get-ctm" role="1.2"><primary sortas="cairo_scaled_font_get_ctm">cairo_scaled_font_get_ctm</primary></indexterm><programlisting><link linkend="void">void</link>                cairo_scaled_font_get_ctm           (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font,
                                                          <link linkend="cairo-matrix-t">cairo_matrix_t</link> *ctm);</programlisting>
 <para>
-Stores the CTM with which <parameter>scaled_font</parameter> was created into <parameter>ctm</parameter>.</para>
+Stores the CTM with which <parameter>scaled_font</parameter> was created into <parameter>ctm</parameter>.
+Note that the translation offsets (x0, y0) of the CTM are ignored
+by <link linkend="cairo-scaled-font-create"><function>cairo_scaled_font_create()</function></link>.  So, the matrix this
+function returns always has 0,0 as x0,y0.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>scaled_font</parameter>&#160;:</term>
@@ -662,7 +667,8 @@ font space to device space.</para>
 <indexterm zone="cairo-scaled-font-get-type" role="1.2"><primary sortas="cairo_scaled_font_get_type">cairo_scaled_font_get_type</primary></indexterm><programlisting><link linkend="cairo-font-type-t">cairo_font_type_t</link>   cairo_scaled_font_get_type          (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font);</programlisting>
 <para>
 This function returns the type of the backend used to create
-a scaled font. See <link linkend="cairo-font-type-t"><type>cairo_font_type_t</type></link> for available types.</para>
+a scaled font. See <link linkend="cairo-font-type-t"><type>cairo_font_type_t</type></link> for available types.
+However, this function never returns <link linkend="CAIRO-FONT-TYPE-TOY--CAPS"><literal>CAIRO_FONT_TYPE_TOY</literal></link>.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>scaled_font</parameter>&#160;:</term>
diff --git a/doc/public/xml/cairo-status.xml b/doc/public/xml/cairo-status.xml
index cfe2046..246758c 100644
--- a/doc/public/xml/cairo-status.xml
+++ b/doc/public/xml/cairo-status.xml
@@ -56,6 +56,7 @@ code is required before or after each individual cairo function call.
 <title>enum cairo_status_t</title>
 <indexterm zone="cairo-status-t"><primary sortas="cairo_status_t">cairo_status_t</primary></indexterm><programlisting>typedef enum _cairo_status {
     CAIRO_STATUS_SUCCESS = 0,
+
     CAIRO_STATUS_NO_MEMORY,
     CAIRO_STATUS_INVALID_RESTORE,
     CAIRO_STATUS_INVALID_POP_GROUP,
@@ -86,8 +87,11 @@ code is required before or after each individual cairo function call.
     CAIRO_STATUS_NEGATIVE_COUNT,
     CAIRO_STATUS_INVALID_CLUSTERS,
     CAIRO_STATUS_INVALID_SLANT,
-    CAIRO_STATUS_INVALID_WEIGHT
-    /* after adding a new error: update CAIRO_STATUS_LAST_STATUS in cairoint.h */
+    CAIRO_STATUS_INVALID_WEIGHT,
+    CAIRO_STATUS_INVALID_SIZE,
+    CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED,
+
+    CAIRO_STATUS_LAST_STATUS
 } cairo_status_t;
 </programlisting>
 <para>
@@ -118,7 +122,7 @@ to get a human-readable representation of an error message.</para>
 </varlistentry>
 <varlistentry id="CAIRO-STATUS-INVALID-POP-GROUP--CAPS" role="constant">
 <term><literal>CAIRO_STATUS_INVALID_POP_GROUP</literal></term>
-<listitem><simpara> no saved group to pop
+<listitem><simpara> no saved group to pop, i.e. <link linkend="cairo-pop-group"><function>cairo_pop_group()</function></link> without matching <link linkend="cairo-push-group"><function>cairo_push_group()</function></link>
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="CAIRO-STATUS-NO-CURRENT-POINT--CAPS" role="constant">
@@ -261,6 +265,24 @@ to get a human-readable representation of an error message.</para>
 <listitem><simpara> invalid value for an input <link linkend="cairo-font-weight-t"><type>cairo_font_weight_t</type></link> (Since 1.8)
 </simpara></listitem>
 </varlistentry>
+<varlistentry id="CAIRO-STATUS-INVALID-SIZE--CAPS" role="constant">
+<term><literal>CAIRO_STATUS_INVALID_SIZE</literal></term>
+<listitem><simpara> invalid value (typically too big) for the size of the input (surface, pattern, etc.) (Since 1.10)
+</simpara></listitem>
+</varlistentry>
+<varlistentry id="CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS" role="constant">
+<term><literal>CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</literal></term>
+<listitem><simpara> user-font method not implemented (Since 1.10)
+</simpara></listitem>
+</varlistentry>
+<varlistentry id="CAIRO-STATUS-LAST-STATUS--CAPS" role="constant">
+<term><literal>CAIRO_STATUS_LAST_STATUS</literal></term>
+<listitem><simpara> this is a special value indicating the number of
+  status values defined in this enumeration.  When using this value, note
+  that the version of cairo at run-time may have additional status values
+  defined than the value of this symbol at compile-time. (Since 1.10)
+</simpara></listitem>
+</varlistentry>
 </variablelist></refsect2>
 <refsect2 id="cairo-status-to-string" role="function">
 <title>cairo_status_to_string ()</title>
diff --git a/doc/public/xml/cairo-surface.xml b/doc/public/xml/cairo-surface.xml
index cf941d8..6ac8109 100644
--- a/doc/public/xml/cairo-surface.xml
+++ b/doc/public/xml/cairo-surface.xml
@@ -19,6 +19,9 @@
 <title role="synopsis.title">Synopsis</title>
 
 <synopsis>
+#define             <link linkend="CAIRO-MIME-TYPE-JP2--CAPS">CAIRO_MIME_TYPE_JP2</link>
+#define             <link linkend="CAIRO-MIME-TYPE-JPEG--CAPS">CAIRO_MIME_TYPE_JPEG</link>
+#define             <link linkend="CAIRO-MIME-TYPE-PNG--CAPS">CAIRO_MIME_TYPE_PNG</link>
 typedef             <link linkend="cairo-surface-t">cairo_surface_t</link>;
 enum                <link linkend="cairo-content-t">cairo_content_t</link>;
 <link linkend="cairo-surface-t">cairo_surface_t</link> *   <link linkend="cairo-surface-create-similar">cairo_surface_create_similar</link>        (<link linkend="cairo-surface-t">cairo_surface_t</link> *other,
@@ -65,6 +68,16 @@ unsigned <link linkend="int">int</link>        <link linkend="cairo-surface-get-
 <link linkend="void">void</link>                <link linkend="cairo-surface-copy-page">cairo_surface_copy_page</link>             (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface);
 <link linkend="void">void</link>                <link linkend="cairo-surface-show-page">cairo_surface_show_page</link>             (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface);
 <link linkend="cairo-bool-t">cairo_bool_t</link>        <link linkend="cairo-surface-has-show-text-glyphs">cairo_surface_has_show_text_glyphs</link>  (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface);
+<link linkend="cairo-status-t">cairo_status_t</link>      <link linkend="cairo-surface-set-mime-data">cairo_surface_set_mime_data</link>         (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface,
+                                                         const <link linkend="char">char</link> *mime_type,
+                                                         unsigned <link linkend="char">char</link> *data,
+                                                         unsigned <link linkend="int">int</link> length,
+                                                         <link linkend="cairo-destroy-func-t">cairo_destroy_func_t</link> destroy,
+                                                         <link linkend="void">void</link> *closure);
+<link linkend="void">void</link>                <link linkend="cairo-surface-get-mime-data">cairo_surface_get_mime_data</link>         (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface,
+                                                         const <link linkend="char">char</link> *mime_type,
+                                                         unsigned <link linkend="char">char</link> **data,
+                                                         unsigned <link linkend="int">int</link> *length);
 </synopsis>
 </refsynopsisdiv>
 
@@ -92,6 +105,27 @@ cairo_<emphasis>backend</emphasis><link linkend="surface-create"><function>_surf
 
 <refsect1 id="cairo-surface.details" role="details">
 <title role="details.title">Details</title>
+<refsect2 id="CAIRO-MIME-TYPE-JP2--CAPS" role="macro">
+<title>CAIRO_MIME_TYPE_JP2</title>
+<indexterm zone="CAIRO-MIME-TYPE-JP2--CAPS"><primary sortas="CAIRO_MIME_TYPE_JP2">CAIRO_MIME_TYPE_JP2</primary></indexterm><programlisting>#define CAIRO_MIME_TYPE_JP2 "image/jp2"
+</programlisting>
+<para>
+The Joint Photographic Experts Group (JPEG) 2000 image coding standard (ISO/IEC 15444-1). Since 1.10
+</para></refsect2>
+<refsect2 id="CAIRO-MIME-TYPE-JPEG--CAPS" role="macro">
+<title>CAIRO_MIME_TYPE_JPEG</title>
+<indexterm zone="CAIRO-MIME-TYPE-JPEG--CAPS"><primary sortas="CAIRO_MIME_TYPE_JPEG">CAIRO_MIME_TYPE_JPEG</primary></indexterm><programlisting>#define CAIRO_MIME_TYPE_JPEG "image/jpeg"
+</programlisting>
+<para>
+The Joint Photographic Experts Group (JPEG) image coding standard (ISO/IEC 10918-1). Since 1.10
+</para></refsect2>
+<refsect2 id="CAIRO-MIME-TYPE-PNG--CAPS" role="macro">
+<title>CAIRO_MIME_TYPE_PNG</title>
+<indexterm zone="CAIRO-MIME-TYPE-PNG--CAPS"><primary sortas="CAIRO_MIME_TYPE_PNG">CAIRO_MIME_TYPE_PNG</primary></indexterm><programlisting>#define CAIRO_MIME_TYPE_PNG "image/png"
+</programlisting>
+<para>
+The Portable Network Graphics image file format (ISO/IEC 15948). Since 1.10
+</para></refsect2>
 <refsect2 id="cairo-surface-t" role="typedef">
 <title>cairo_surface_t</title>
 <indexterm zone="cairo-surface-t"><primary sortas="cairo_surface_t">cairo_surface_t</primary></indexterm><programlisting>typedef struct _cairo_surface cairo_surface_t;
@@ -497,7 +531,8 @@ resolution if never set.</para>
     CAIRO_SURFACE_TYPE_SVG,
     CAIRO_SURFACE_TYPE_OS2,
     CAIRO_SURFACE_TYPE_WIN32_PRINTING,
-    CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
+    CAIRO_SURFACE_TYPE_QUARTZ_IMAGE,
+    CAIRO_SURFACE_TYPE_SCRIPT
 } cairo_surface_type_t;
 </programlisting>
 <para>
@@ -598,6 +633,11 @@ New entries may be added in future versions.</para>
 <listitem><simpara> The surface is of type quartz_image
 </simpara></listitem>
 </varlistentry>
+<varlistentry id="CAIRO-SURFACE-TYPE-SCRIPT--CAPS" role="constant">
+<term><literal>CAIRO_SURFACE_TYPE_SCRIPT</literal></term>
+<listitem><simpara> The surface is of type script, since 1.10
+</simpara></listitem>
+</varlistentry>
 </variablelist><para role="since">Since 1.2</para></refsect2>
 <refsect2 id="cairo-surface-get-type" role="function" condition="since:1.2">
 <title>cairo_surface_get_type ()</title>
@@ -739,6 +779,69 @@ target surface does not use it.</para>
 
 </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 1.8</para></refsect2>
+<refsect2 id="cairo-surface-set-mime-data" role="function" condition="since:1.10">
+<title>cairo_surface_set_mime_data ()</title>
+<indexterm zone="cairo-surface-set-mime-data" role="1.10"><primary sortas="cairo_surface_set_mime_data">cairo_surface_set_mime_data</primary></indexterm><programlisting><link linkend="cairo-status-t">cairo_status_t</link>      cairo_surface_set_mime_data         (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface,
+                                                         const <link linkend="char">char</link> *mime_type,
+                                                         unsigned <link linkend="char">char</link> *data,
+                                                         unsigned <link linkend="int">int</link> length,
+                                                         <link linkend="cairo-destroy-func-t">cairo_destroy_func_t</link> destroy,
+                                                         <link linkend="void">void</link> *closure);</programlisting>
+<para>
+Attach an image in the format <parameter>mime_type</parameter> to <parameter>surface</parameter>. To remove
+the data from a surface, call this function with same mime type
+and <link linkend="NULL--CAPS"><literal>NULL</literal></link> for <parameter>data</parameter>.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>surface</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="cairo-surface-t"><type>cairo_surface_t</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>mime_type</parameter>&#160;:</term>
+<listitem><simpara> the mime type of the image data
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara> the image data to attach to the surface
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>length</parameter>&#160;:</term>
+<listitem><simpara> the length of the image data
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>destroy</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="cairo-destroy-func-t"><type>cairo_destroy_func_t</type></link> which will be called when the
+surface is destroyed or when new image data is attached using the
+same mime type.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>closure</parameter>&#160;:</term>
+<listitem><simpara> the data to be passed to the <parameter>destroy</parameter> notifier
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="CAIRO-STATUS-SUCCESS--CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link> or <link linkend="CAIRO-STATUS-NO-MEMORY--CAPS"><literal>CAIRO_STATUS_NO_MEMORY</literal></link> if a
+slot could not be allocated for the user data.
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 1.10</para></refsect2>
+<refsect2 id="cairo-surface-get-mime-data" role="function" condition="since:1.10">
+<title>cairo_surface_get_mime_data ()</title>
+<indexterm zone="cairo-surface-get-mime-data" role="1.10"><primary sortas="cairo_surface_get_mime_data">cairo_surface_get_mime_data</primary></indexterm><programlisting><link linkend="void">void</link>                cairo_surface_get_mime_data         (<link linkend="cairo-surface-t">cairo_surface_t</link> *surface,
+                                                         const <link linkend="char">char</link> *mime_type,
+                                                         unsigned <link linkend="char">char</link> **data,
+                                                         unsigned <link linkend="int">int</link> *length);</programlisting>
+<para>
+Return mime data previously attached to <parameter>surface</parameter> using the
+specified mime type.  If no data has been attached with the given
+mime type, <parameter>data</parameter> is set <link linkend="NULL--CAPS"><literal>NULL</literal></link>.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>surface</parameter>&#160;:</term>
+<listitem><simpara> a <link linkend="cairo-surface-t"><type>cairo_surface_t</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>mime_type</parameter>&#160;:</term>
+<listitem><simpara> the mime type of the image data
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara> the image data to attached to the surface
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>length</parameter>&#160;:</term>
+<listitem><simpara> the length of the image data
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since 1.10</para></refsect2>
 
 </refsect1>
 
diff --git a/doc/public/xml/cairo-text.xml b/doc/public/xml/cairo-text.xml
index cd74617..b5ccc9f 100644
--- a/doc/public/xml/cairo-text.xml
+++ b/doc/public/xml/cairo-text.xml
@@ -287,6 +287,14 @@ remember), but the standard CSS2 generic family names, ("serif",
 work as expected.
 </para>
 <para>
+If <parameter>family</parameter> starts with the string "<parameter>cairo</parameter>:", or if no native font
+backends are compiled in, cairo will use an internal font family.
+The internal font family recognizes many modifiers in the <parameter>family</parameter>
+string, most notably, it recognizes the string "monospace".  That is,
+the family name "<parameter>cairo</parameter>:monospace" will use the monospace version of
+the internal font family.
+</para>
+<para>
 For "real" font selection, see the font-backend-specific
 font_face_create functions for the font backend you are using. (For
 example, if you are using the freetype-based cairo-ft font backend,
@@ -730,7 +738,7 @@ family is assumed.  The default family then can be queried using
 </para>
 <para>
 The <link linkend="cairo-select-font-face"><function>cairo_select_font_face()</function></link> function uses this to create font faces.
-See that function for limitations of toy font faces.</para>
+See that function for limitations and other details of toy font faces.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>family</parameter>&#160;:</term>
diff --git a/doc/public/xml/cairo-user-fonts.xml b/doc/public/xml/cairo-user-fonts.xml
index 1d55003..d7fe1ca 100644
--- a/doc/public/xml/cairo-user-fonts.xml
+++ b/doc/public/xml/cairo-user-fonts.xml
@@ -139,8 +139,7 @@ in deadlock.</para>
 <varlistentry><term><parameter>extents</parameter>&#160;:</term>
 <listitem><simpara> font extents to fill in, in font space
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="CAIRO-STATUS-SUCCESS--CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link> upon success, or
-<link linkend="CAIRO-STATUS-USER-FONT-ERROR--CAPS"><literal>CAIRO_STATUS_USER_FONT_ERROR</literal></link> or any other error status on error.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="CAIRO-STATUS-SUCCESS--CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link> upon success, or an error status on error.
 
 </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 1.8</para></refsect2>
@@ -253,7 +252,8 @@ will free the allocated cluster array using <link linkend="cairo-text-cluster-fr
 </para>
 <para>
 The callback is optional.  If <parameter>num_glyphs</parameter> is negative upon
-the callback returning, the unicode_to_glyph callback
+the callback returning or if the return value
+is <link linkend="CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"><literal>CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</literal></link>, the unicode_to_glyph callback
 is tried.  See <link linkend="cairo-user-scaled-font-unicode-to-glyph-func-t"><type>cairo_user_scaled_font_unicode_to_glyph_func_t</type></link>.
 </para>
 <para>
@@ -291,8 +291,9 @@ glyph value for other purposes.</para>
 <listitem><simpara> pointer to location to store cluster flags corresponding to the
                 output <parameter>clusters</parameter>
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="CAIRO-STATUS-SUCCESS--CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link> upon success, or
-<link linkend="CAIRO-STATUS-USER-FONT-ERROR--CAPS"><literal>CAIRO_STATUS_USER_FONT_ERROR</literal></link> or any other error status on error.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="CAIRO-STATUS-SUCCESS--CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link> upon success,
+<link linkend="CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"><literal>CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</literal></link> if fallback options should be tried,
+or <link linkend="CAIRO-STATUS-USER-FONT-ERROR--CAPS"><literal>CAIRO_STATUS_USER_FONT_ERROR</literal></link> or any other error status on error.
 
 </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 1.8</para></refsect2>
@@ -319,8 +320,9 @@ complex scripts can be implemented using this callback.
 </para>
 <para>
 The callback is optional, and only used if text_to_glyphs callback is not
-set or fails to return glyphs.  If this callback is not set, an identity
-mapping from Unicode code-points to glyph indices is assumed.
+set or fails to return glyphs.  If this callback is not set or if it returns
+<link linkend="CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"><literal>CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</literal></link>, an identity mapping from Unicode
+code-points to glyph indices is assumed.
 </para>
 <para>
 Note: While cairo does not impose any limitation on glyph indices,
@@ -341,8 +343,9 @@ glyph value for other purposes.</para>
 <varlistentry><term><parameter>glyph_index</parameter>&#160;:</term>
 <listitem><simpara> output glyph index
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="CAIRO-STATUS-SUCCESS--CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link> upon success, or
-<link linkend="CAIRO-STATUS-USER-FONT-ERROR--CAPS"><literal>CAIRO_STATUS_USER_FONT_ERROR</literal></link> or any other error status on error.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="CAIRO-STATUS-SUCCESS--CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link> upon success,
+<link linkend="CAIRO-STATUS-USER-FONT-NOT-IMPLEMENTED--CAPS"><literal>CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED</literal></link> if fallback options should be tried,
+or <link linkend="CAIRO-STATUS-USER-FONT-ERROR--CAPS"><literal>CAIRO_STATUS_USER_FONT_ERROR</literal></link> or any other error status on error.
 
 </simpara></listitem></varlistentry>
 </variablelist><para role="since">Since 1.8</para></refsect2>
diff --git a/doc/public/xml/cairo-win32-fonts.xml b/doc/public/xml/cairo-win32-fonts.xml
index 96d6d34..bd31f17 100644
--- a/doc/public/xml/cairo-win32-fonts.xml
+++ b/doc/public/xml/cairo-win32-fonts.xml
@@ -61,7 +61,8 @@ Microsoft Windows systems.
 <title role="details.title">Details</title>
 <refsect2 id="CAIRO-HAS-WIN32-FONT--CAPS" role="macro">
 <title>CAIRO_HAS_WIN32_FONT</title>
-<indexterm zone="CAIRO-HAS-WIN32-FONT--CAPS"><primary sortas="CAIRO_HAS_WIN32_FONT">CAIRO_HAS_WIN32_FONT</primary></indexterm><programlisting>#define             CAIRO_HAS_WIN32_FONT</programlisting>
+<indexterm zone="CAIRO-HAS-WIN32-FONT--CAPS"><primary sortas="CAIRO_HAS_WIN32_FONT">CAIRO_HAS_WIN32_FONT</primary></indexterm><programlisting>#define CAIRO_HAS_WIN32_FONT 1
+</programlisting>
 <para>
 Defined if the Microsoft Windows font backend is available.
 This macro can be used to conditionally compile backend-specific code.
@@ -124,7 +125,7 @@ and can be used with functions such as <link linkend="cairo-win32-scaled-font-se
 </para><variablelist role="params">
 <varlistentry><term><parameter>logfont</parameter>&#160;:</term>
 <listitem><simpara> A <link linkend="LOGFONTW--CAPS"><type>LOGFONTW</type></link> structure specifying the font to use.
-  If hfont is null then the lfHeight, lfWidth, lfOrientation and lfEscapement
+  If <parameter>font</parameter> is <link linkend="NULL--CAPS"><literal>NULL</literal></link> then the lfHeight, lfWidth, lfOrientation and lfEscapement
   fields of this structure are ignored. Otherwise lfWidth, lfOrientation and
   lfEscapement must be zero.
 </simpara></listitem></varlistentry>
diff --git a/doc/public/xml/cairo-win32.xml b/doc/public/xml/cairo-win32.xml
index 980e7a4..4f27c67 100644
--- a/doc/public/xml/cairo-win32.xml
+++ b/doc/public/xml/cairo-win32.xml
@@ -63,7 +63,8 @@ The surface returned by the other win32 constructors is of surface type
 <title role="details.title">Details</title>
 <refsect2 id="CAIRO-HAS-WIN32-SURFACE--CAPS" role="macro">
 <title>CAIRO_HAS_WIN32_SURFACE</title>
-<indexterm zone="CAIRO-HAS-WIN32-SURFACE--CAPS"><primary sortas="CAIRO_HAS_WIN32_SURFACE">CAIRO_HAS_WIN32_SURFACE</primary></indexterm><programlisting>#define             CAIRO_HAS_WIN32_SURFACE</programlisting>
+<indexterm zone="CAIRO-HAS-WIN32-SURFACE--CAPS"><primary sortas="CAIRO_HAS_WIN32_SURFACE">CAIRO_HAS_WIN32_SURFACE</primary></indexterm><programlisting>#define CAIRO_HAS_WIN32_SURFACE 1
+</programlisting>
 <para>
 Defined if the Microsoft Windows surface backend is available.
 This macro can be used to conditionally compile backend-specific code.
diff --git a/doc/public/xml/cairo.xml b/doc/public/xml/cairo.xml
index b57ba49..c2499fb 100644
--- a/doc/public/xml/cairo.xml
+++ b/doc/public/xml/cairo.xml
@@ -697,7 +697,7 @@ Note that this option does not affect text rendering, instead see
 <title>cairo_get_antialias ()</title>
 <indexterm zone="cairo-get-antialias"><primary sortas="cairo_get_antialias">cairo_get_antialias</primary></indexterm><programlisting><link linkend="cairo-antialias-t">cairo_antialias_t</link>   cairo_get_antialias                 (<link linkend="cairo-t">cairo_t</link> *cr);</programlisting>
 <para>
-Gets the current shape antialiasing mode, as set by <link linkend="cairo-set-antialias"><function>cairo_set_antialias()</function></link>.</para>
+Gets the current shape antialiasing mode, as set by <link linkend="cairo-set-shape-antialias"><function>cairo_set_shape_antialias()</function></link>.</para>
 <para>
 </para><variablelist role="params">
 <varlistentry><term><parameter>cr</parameter>&#160;:</term>
author	Sebastian Dröge <sebastian.droege@collabora.co.uk>	2009-09-15 16:33:27 +0200
committer	Sebastian Dröge <sebastian.droege@collabora.co.uk>	2009-09-15 16:33:27 +0200
commit	0e79096a3831c10cf9735a7f518bfb65d0632923 (patch)
tree	40e397ecf2131c041bd6e308d5c351a36be113f6 /doc
parent	23ad3f4fac1b4486013b7d4e7e0b8841625bfaaf (diff)