[cairo-commit] cairo/doc/public cairo-sections.txt,1.9,1.10

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/doc/public
In directory gabe:/tmp/cvs-serv7423/doc/public

Modified Files:
	cairo-sections.txt 
Log Message:
2005-04-06  Owen Taylor  <otaylor at redhat.com>

        * 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.

        * src/cairo.[ch]: Rename cairo_font_get_extents() to
        cairo_font_extents()

        * doc/public/cairo-sections.txt: Update, split font functions
        into a separate section.

        * src/cairo-ft-font.c (_ft_unscaled_font_get_for_pattern): Fix
        locking order problem.

        * src/cairo-font.c: 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.


Index: cairo-sections.txt
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/cairo-sections.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cairo-sections.txt	17 Mar 2005 20:57:42 -0000	1.9
+++ cairo-sections.txt	7 Apr 2005 18:04:00 -0000	1.10
@@ -7,11 +7,10 @@
 <SECTION>
 <FILE>cairo-ft</FILE>
 <TITLE>FreeType Fonts</TITLE>
-cairo_ft_font_create
-cairo_ft_font_create_for_ft_face
-cairo_ft_font_lock_face
-cairo_ft_font_unlock_face
-cairo_ft_font_get_pattern
+cairo_ft_font_face_create_for_pattern
+cairo_ft_font_face_create_for_ft_face
+cairo_ft_scaled_font_lock_face
+cairo_ft_scaled_font_unlock_face
 </SECTION>
 
 <SECTION>
@@ -56,10 +55,10 @@
 <TITLE>Microsoft Windows Backend</TITLE>
 cairo_set_target_win32
 cairo_win32_surface_create
-cairo_win32_font_create_for_logfontw
-cairo_win32_font_select_font
-cairo_win32_font_done_font
-cairo_win32_font_get_scale_factor
+cairo_win32_font_face_create_for_logfontw
+cairo_win32_scaled_font_select_font
+cairo_win32_scaled_font_done_font
+cairo_win32_scaled_font_get_metrics_factor
 </SECTION>
 
 <SECTION>
@@ -137,6 +136,22 @@
 </SECTION>
 
 <SECTION>
+<FILE>cairo-font</FILE>
+<TITLE>Fonts</TITLE>
+cairo_font_face_t
+cairo_scaled_font_t
+cairo_font_face_reference
+cairo_font_face_destroy
+cairo_scaled_font_create
+cairo_scaled_font_reference
+cairo_scaled_font_destroy
+cairo_font_extents_t
+cairo_scaled_font_extents
+cairo_text_extents_t
+cairo_scaled_font_glyph_extents
+</SECTION>
+
+<SECTION>
 <FILE>cairo</FILE>
 <TITLE>cairo_t</TITLE>
 cairo_t
@@ -197,10 +212,7 @@
 cairo_fill_extents
 cairo_init_clip
 cairo_clip
-cairo_font_t
 cairo_glyph_t
-cairo_text_extents_t
-cairo_font_extents_t
 cairo_font_slant_t
 cairo_font_weight_t
 cairo_select_font
@@ -208,17 +220,13 @@
 cairo_transform_font
 cairo_show_text
 cairo_show_glyphs
-cairo_get_font
-cairo_get_font_extents
-cairo_set_font
+cairo_get_font_face
+cairo_font_extents
+cairo_set_font_face
 cairo_text_extents
 cairo_glyph_extents
 cairo_text_path
 cairo_glyph_path
-cairo_font_reference
-cairo_font_destroy
-cairo_font_extents
-cairo_font_glyph_extents
 cairo_show_surface
 cairo_get_operator
 cairo_get_rgb_color
@@ -267,6 +275,7 @@
 cairo_current_path_flat
 cairo_current_font
 cairo_current_font_extents
+cairo_get_font_extents
 cairo_get_status
 cairo_get_status_string
 </SECTION>