src/cairo.h src/cairo-font.c src/cairoint.h doc/public/cairo-sections.txt: Add cairo_font_face_set/get_user_data().

src/cairo-array.c src/cairoint.h src/cairo-surface.c: Refactor user data code from cairo-surface.c into cairo_user_data_array_t.
Switch these types to be like cairo_surface_t where the generic code frees the wrapper object.
src/cairo-atsui-font.c src/cairo-ft-font.c src/cairo-win32-font.c: Fix up for the above changes.
Implement a complicated mutual-referencing scheme to make sure that a face from cairo_ft_font_face_create_for_ft_face() is freed only when the FT_Face is no longer needed.
Update the docs to describe how to figure out when the FT_Face can be freed.
Fix refcount leaks when creating fonts.
Remove excess call to _cairo_unscaled_font_reference().
Remove stray initialization of font matrix to the identity.
test/user-data.c: Fix a bug when setting/unsetting a key with a free key slot before it, add that to the test case.
Don't append an element when user_data is NULL.

6 files changed, 16 insertions, 41 deletions

diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index 94ba4f8ab..1b2e54617 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -142,6 +142,8 @@ cairo_font_face_t
 cairo_scaled_font_t
 cairo_font_face_reference
 cairo_font_face_destroy
+cairo_font_face_get_user_data
+cairo_font_face_set_user_data
 cairo_scaled_font_create
 cairo_scaled_font_reference
 cairo_scaled_font_destroy
diff --git a/doc/public/tmpl/cairo-font.sgml b/doc/public/tmpl/cairo-font.sgml
index cdf0ed288..a04a1e9c7 100644
--- a/doc/public/tmpl/cairo-font.sgml
+++ b/doc/public/tmpl/cairo-font.sgml
@@ -17,32 +17,42 @@ Font Handling
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_font_face_t ##### -->
+<!-- ##### FUNCTION cairo_font_face_reference ##### -->
 <para>
 
 </para>
 
+@font_face: 
+
 
-<!-- ##### TYPEDEF cairo_scaled_font_t ##### -->
+<!-- ##### FUNCTION cairo_font_face_destroy ##### -->
 <para>
 
 </para>
 
+@font_face: 
+
 
-<!-- ##### FUNCTION cairo_font_face_reference ##### -->
+<!-- ##### FUNCTION cairo_font_face_get_user_data ##### -->
 <para>
 
 </para>
 
 @font_face: 
+@key: 
+@Returns: 
 
 
-<!-- ##### FUNCTION cairo_font_face_destroy ##### -->
+<!-- ##### FUNCTION cairo_font_face_set_user_data ##### -->
 <para>
 
 </para>
 
 @font_face: 
+@key: 
+@user_data: 
+@destroy: 
+@Returns: 
 
 
 <!-- ##### FUNCTION cairo_scaled_font_create ##### -->
diff --git a/doc/public/tmpl/cairo-matrix.sgml b/doc/public/tmpl/cairo-matrix.sgml
index 686d89adf..e1d2f8ccf 100644
--- a/doc/public/tmpl/cairo-matrix.sgml
+++ b/doc/public/tmpl/cairo-matrix.sgml
@@ -41,18 +41,6 @@ cairo_matrix_t
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT cairo_matrix_t ##### -->
-<para>
-
-</para>
-
-@xx: 
-@yx: 
-@xy: 
-@yy: 
-@x0: 
-@y0: 
-
 <!-- ##### FUNCTION cairo_matrix_create ##### -->
 <para>
 
diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml
index 4687bd6c8..747dba286 100644
--- a/doc/public/tmpl/cairo-pattern.sgml
+++ b/doc/public/tmpl/cairo-pattern.sgml
@@ -17,12 +17,6 @@ cairo_pattern_t
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_pattern_t ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### FUNCTION cairo_pattern_create_for_surface ##### -->
 <para>
 
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index b6b7217cd..456347e9e 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -17,12 +17,6 @@ cairo_surface_t
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_surface_t ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO cairo_surface_create_for_image ##### -->
 <para>
 
diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index 6fb842ae6..a725a1b49 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -27,12 +27,6 @@ Drawing contexts.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_t ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### FUNCTION cairo_create ##### -->
 <para>
 
@@ -997,13 +991,6 @@ End:
 @data: 
 
 
-<!-- ##### STRUCT cairo_user_data_key_t ##### -->
-<para>
-
-</para>
-
-@unused: 
-
 <!-- ##### USER_FUNCTION cairo_write_func_t ##### -->
 <para>