[cairo-commit] cairo/doc/reference doc.xml,1.6,1.7

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/doc/reference
In directory gabe:/tmp/cvs-serv3974/doc/reference

Modified Files:
	doc.xml 
Log Message:
2005-01-16  Owen Taylor  <otaylor at redhat.com>

        Change cairo_font_t to refer to a font scaled to a particular
        output device resolution.

        * src/cairoint.h src/cairo_font.c src/cairo_ft_font.c
        src/cairo_xlib_surface.c src/cairo_pdf_surface.c src/cairo_gstate.c
        src/cairo.c: Switch many internal methods from handling
        cairo_unscaled_font_t and cairo_font_scale_t pairs to handling
        cairo_font_t.

        * src/cairo-ft-private.h src/cairo_ft_fontc: Add some internal
        interfaces for use by the FreeType backend.

        * src/cairo_gstate.c: Clear the gstate's current font when
        the transform or target surface changes.

        * src/cairo.h src/cairo_ft_font.c: Rename cairo_ft_font_pattern
        to cairo_ft_font_get_pattern().

        * src/cairo.h src/cairo_ft_font.c: Make cairo_ft_font_create()
        and cairo_ft_font_create_for_ft_face() take a font scale;
        make the latter take load_flags for FT_Load_Glyph() as well.
        Change cairo_ft_font_face() to Xft-style cairo_ft_font_lock_face,
        cairo_ft_font_unlock_face.

        * src/cairo_font.c: Remove the name/slant/weight=>unscaled font
        cache, it didn't work with the new cairo_font_t setup. If it turns
        out to be needed, it can be added back in some other form.

        * src/cairoint.h src/cairo_font.c: Add a 'flags' field
        to cairo_glyph_cache_key_t, we use it for load flags with
        freetype backend.

        * src/cairo_ft_font.c: Switch the caching to be from
        resolved fontconfig pattern => file; keep only a fixed number
        of FT_Face objects open at once, similar to FreeType.

        * src/cairo_font.c (cairo_font_glyph_extents) src/cairo_gstate.c
        src/cairoint.h: Add public cairo_font_glyph_extents, use it
        to implement _cairo_gstate_glyph_extents().

        * src/cairo_xlib_surface.c (_glyphset_cache_entry_reference):
        Add refcounting for glyph cache elements; there was an
        bug where elements got ejected from the cache and freed before
        they could be used.

        * src/cairoint.h src/cairo_cache.c (_cairo_cache_random_entry())
        New function to return a random entry in the cache matching a predicate;
        reuse the internals for the previous _random_live_entry().

        * src/cairoint.h src/cairo_cache.c (_cairo_cache_lookup()): Add an
        optional created_entry return value.

        * src/cairo_ft_font.c src/cairo_xlib_surface.c: Adapt to
        _cairo_cache_lookup() change.

        * src/cairo_cache.c (_cairo_cache_lookup()): Support max_memory == 0
        to indicate an unbounded cache.

        * src/cairoint.h src/cairo_cache.c (_cairo_cache_remove()): Add a
        function to manually remove entries from the cache.

        * doc/reference: Update for changes, document cairo_matrix_t,
        cairo_glyph_t, etc.

        * src/cairo.h src/cairo-atsui.h src/cairo-ft.h src/cairo-glitz.h
        src/cairo-pdf.h src/cairo-png.h src/cairo-ps.h src/cairo-quartz.h
        src/cairo-xcb.h src/cairo-xlib.h: Add CAIRO_BEGIN/END_DECLS for
        extern "C", use it on all public headers. Move header guards
        outermost.

        * src/cairo_quartz_surface.c: Fix encoding.


Index: doc.xml
===================================================================
RCS file: /cvs/cairo/cairo/doc/reference/doc.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- doc.xml	26 Feb 2004 22:47:21 -0000	1.6
+++ doc.xml	21 Jan 2005 22:33:47 -0000	1.7
@@ -51,6 +51,7 @@
 <!ENTITY cairo_clip SYSTEM "xml/cairo_clip.xml">
 <!ENTITY cairo_select_font SYSTEM "xml/cairo_select_font.xml">
 <!ENTITY cairo_scale_font SYSTEM "xml/cairo_scale_font.xml">
+<!ENTITY cairo_set_font SYSTEM "xml/cairo_set_font.xml">
 <!ENTITY cairo_show_text SYSTEM "xml/cairo_show_text.xml">
 <!ENTITY cairo_text_extents SYSTEM "xml/cairo_text_extents.xml">
 <!ENTITY cairo_current_operator SYSTEM "xml/cairo_current_operator.xml">
@@ -85,13 +86,22 @@
 <!ENTITY cairo_matrix_multiply SYSTEM "xml/cairo_matrix_multiply.xml">
 <!ENTITY cairo_matrix_transform_distance SYSTEM "xml/cairo_matrix_transform_distance.xml">
 <!ENTITY cairo_matrix_transform_point SYSTEM "xml/cairo_matrix_transform_point.xml">
+<!ENTITY cairo_font_glyph_extents SYSTEM "xml/cairo_font_glyph_extents.xml">
+<!ENTITY cairo_ft_font_create SYSTEM "xml/cairo_ft_font_create.xml">
+<!ENTITY cairo_ft_font_create_for_ft_face SYSTEM "xml/cairo_ft_font_create_for_ft_face.xml">
+<!ENTITY cairo_ft_font_lock_face SYSTEM "xml/cairo_ft_font_lock_face.xml">
+<!ENTITY cairo_ft_font_unlock_face SYSTEM "xml/cairo_ft_font_unlock_face.xml">
+<!ENTITY cairo_ft_font_get_pattern SYSTEM "xml/cairo_ft_font_get_pattern.xml">
 <!ENTITY cairo_t SYSTEM "xml/cairo_t.xml">
+<!ENTITY cairo_font_t SYSTEM "xml/cairo_font_t.xml">
+<!ENTITY cairo_glyph_t SYSTEM "xml/cairo_glyph_t.xml">
 <!ENTITY cairo_matrix_t SYSTEM "xml/cairo_matrix_t.xml">
 <!ENTITY cairo_surface_t SYSTEM "xml/cairo_surface_t.xml">
 <!ENTITY cairo_format_t SYSTEM "xml/cairo_format_t.xml">
 <!ENTITY cairo_operator_t SYSTEM "xml/cairo_operator_t.xml">
 <!ENTITY cairo_fill_rule_t SYSTEM "xml/cairo_fill_rule_t.xml">
 <!ENTITY cairo_line_cap_t SYSTEM "xml/cairo_line_cap_t.xml">
+<!ENTITY cairo_matrix_t SYSTEM "xml/cairo_matrix_t.xml">
 <!ENTITY cairo_text_extents_t SYSTEM "xml/cairo_text_extents_t.xml">
 ]>
 <book lang="en"> 
@@ -150,6 +160,7 @@
 &cairo_clip;
 &cairo_select_font;
 &cairo_scale_font;
+&cairo_set_font;
 &cairo_show_text;
 &cairo_text_extents;
 &cairo_current_operator;
@@ -184,16 +195,24 @@
 &cairo_matrix_multiply;
 &cairo_matrix_transform_distance;
 &cairo_matrix_transform_point;
+&cairo_font_glyph_extents;
+&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;
 </reference>
 <reference>
 <title>types and enums</title>
 &cairo_t;
-&cairo_matrix_t;
+&cairo_font_t;
+&cairo_glyph_t;
 &cairo_surface_t;
 &cairo_format_t;
 &cairo_operator_t;
 &cairo_fill_rule_t;
 &cairo_line_cap_t;
+&cairo_matrix_t;
 &cairo_text_extents_t;
 </reference>
 </book>