src/cairo.h src/cairo-gstate.c src/cairo-font.c: Add a cairo_font_face_t type to hold a description of a font face. Replace cairo_set_font() with cairo_set_font_face().

src/cairoint.h src/cairo-font.c src/cairo-gstate.c: Add "cairo_simple_font_face" for family/weight/slant and use it to implement font naming for the toy API.
src/cairo-ft.h src/cairo-ft-font.c cairo-win32.h cairo-win32-font.c: Switch the FreeType and Win32 backends over to using cairo_font_face_t.
src/cairo.h src/cairo-font.c src/cairo-ft-font.c src/cairo-win32-font.c: Pass in font matrix and CTM separately rather than as a composite scale when creating fonts; allows removing font_matrix argument to metrics functions.
src/cairoint.h src/cairo-font.c src/cairo-ft-font.c src/cairo-win32-font.c: Remove cairo_font_scale_t type, just use cairo_matrix_t and ignore translations.
src/cairo-ft.h src/cairo-ft-font.c: Remove cairo_ft_font_get_pattern() -- it can't work for all FreeType backend fonts and doesn't seem particularly useful.
Rename cairo_font_get_extents() to cairo_font_extents()
split font functions into a separate section.
Fix locking order problem.
Add caches for simple font faces and from cairo_font_face_t to cairo_scaled_font_t.
src/cairo.h src/cairoint.h src/cairo-font.c src/cairo-win32-font.c src/cairo-ft-font.c src/cairo-gstate.c src/cairo-gstate-private.h: Rename cairo_font_t to cairo_scaled_font_t.

1 files changed, 24 insertions, 106 deletions

diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index 652f5ebd..016ae5d3 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -292,11 +292,12 @@ Drawing contexts.
 @angle: 
 
 
-<!-- ##### FUNCTION cairo_concat_matrix ##### -->
+<!-- ##### MACRO cairo_concat_matrix ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 @matrix: 
 
@@ -310,11 +311,12 @@ Drawing contexts.
 @matrix: 
 
 
-<!-- ##### FUNCTION cairo_default_matrix ##### -->
+<!-- ##### MACRO cairo_default_matrix ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 
 
@@ -326,41 +328,45 @@ Drawing contexts.
 @cr: 
 
 
-<!-- ##### FUNCTION cairo_transform_point ##### -->
+<!-- ##### MACRO cairo_transform_point ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 @x: 
 @y: 
 
 
-<!-- ##### FUNCTION cairo_transform_distance ##### -->
+<!-- ##### MACRO cairo_transform_distance ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 @dx: 
 @dy: 
 
 
-<!-- ##### FUNCTION cairo_inverse_transform_point ##### -->
+<!-- ##### MACRO cairo_inverse_transform_point ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 @x: 
 @y: 
 
 
-<!-- ##### FUNCTION cairo_inverse_transform_distance ##### -->
+<!-- ##### MACRO cairo_inverse_transform_distance ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 @dx: 
 @dy: 
@@ -572,11 +578,12 @@ Drawing contexts.
 @y2: 
 
 
-<!-- ##### FUNCTION cairo_init_clip ##### -->
+<!-- ##### MACRO cairo_init_clip ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 
 
@@ -588,12 +595,6 @@ Drawing contexts.
 @cr: 
 
 
-<!-- ##### TYPEDEF cairo_font_t ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT cairo_glyph_t ##### -->
 <para>
 
@@ -603,29 +604,6 @@ Drawing contexts.
 @x: 
 @y: 
 
-<!-- ##### STRUCT cairo_text_extents_t ##### -->
-<para>
-
-</para>
-
-@x_bearing: 
-@y_bearing: 
-@width: 
-@height: 
-@x_advance: 
-@y_advance: 
-
-<!-- ##### STRUCT cairo_font_extents_t ##### -->
-<para>
-
-</para>
-
-@ascent: 
-@descent: 
-@height: 
-@max_x_advance: 
-@max_y_advance: 
-
 <!-- ##### ENUM cairo_font_slant_t ##### -->
 <para>
 
@@ -691,7 +669,7 @@ Drawing contexts.
 @num_glyphs: 
 
 
-<!-- ##### FUNCTION cairo_get_font ##### -->
+<!-- ##### FUNCTION cairo_get_font_face ##### -->
 <para>
 
 </para>
@@ -700,22 +678,26 @@ Drawing contexts.
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_get_font_extents ##### -->
+<!-- ##### FUNCTION cairo_font_extents ##### -->
 <para>
 
 </para>
 
 @cr: 
 @extents: 
+<!-- # Unused Parameters # -->
+@font: 
+@Returns: 
+@font_matrix: 
 
 
-<!-- ##### FUNCTION cairo_set_font ##### -->
+<!-- ##### FUNCTION cairo_set_font_face ##### -->
 <para>
 
 </para>
 
 @cr: 
-@font: 
+@font_face: 
 
 
 <!-- ##### FUNCTION cairo_text_extents ##### -->
@@ -758,45 +740,6 @@ Drawing contexts.
 @num_glyphs: 
 
 
-<!-- ##### FUNCTION cairo_font_reference ##### -->
-<para>
-
-</para>
-
-@font: 
-
-
-<!-- ##### FUNCTION cairo_font_destroy ##### -->
-<para>
-
-</para>
-
-@font: 
-
-
-<!-- ##### FUNCTION cairo_font_extents ##### -->
-<para>
-
-</para>
-
-@font: 
-@font_matrix: 
-@extents: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_font_glyph_extents ##### -->
-<para>
-
-</para>
-
-@font: 
-@font_matrix: 
-@glyphs: 
-@num_glyphs: 
-@extents: 
-
-
 <!-- ##### FUNCTION cairo_show_surface ##### -->
 <para>
 
@@ -916,6 +859,8 @@ Drawing contexts.
 </para>
 
 @cr: 
+@Returns: 
+<!-- # Unused Parameters # -->
 @matrix: 
 
 
@@ -953,33 +898,6 @@ Drawing contexts.
 @closure: 
 
 
-<!-- ##### FUNCTION cairo_copy_path_data ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_copy_path_data_flat ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_append_path_data ##### -->
-<para>
-
-</para>
-
-@cr: 
-@path_data: 
-
-
 <!-- ##### ENUM cairo_status_t ##### -->
 <para>