[cairo-commit] cairo/doc/public/tmpl cairo-font.sgml, NONE, 1.1 cairo-ft.sgml, 1.2, 1.3 cairo-matrix.sgml, 1.3, 1.4 cairo-pdf.sgml, 1.3, 1.4 cairo-png.sgml, 1.2, 1.3 cairo-surface.sgml, 1.5, 1.6 cairo.sgml, 1.5, 1.6

Owen Taylor commit at pdx.freedesktop.org
Thu Apr 7 11:04:02 PDT 2005 

Committed by: otaylor

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

Modified Files:
	cairo-ft.sgml cairo-matrix.sgml cairo-pdf.sgml cairo-png.sgml 
	cairo-surface.sgml cairo.sgml 
Added Files:
	cairo-font.sgml 
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.


--- NEW FILE: cairo-font.sgml ---
<!-- ##### SECTION Title ##### -->
Fonts

<!-- ##### SECTION Short_Description ##### -->
Font Handling

<!-- ##### SECTION Long_Description ##### -->
<para>

</para>

<!-- ##### SECTION See_Also ##### -->
<para>

</para>

<!-- ##### SECTION Stability_Level ##### -->


<!-- ##### TYPEDEF cairo_font_face_t ##### -->
<para>

</para>


<!-- ##### TYPEDEF cairo_scaled_font_t ##### -->
<para>

</para>


<!-- ##### FUNCTION cairo_font_face_reference ##### -->
<para>

</para>

@font_face: 


<!-- ##### FUNCTION cairo_font_face_destroy ##### -->
<para>

</para>

@font_face: 


<!-- ##### FUNCTION cairo_scaled_font_create ##### -->
<para>

</para>

@font_face: 
@font_matrix: 
@ctm: 
@Returns: 


<!-- ##### FUNCTION cairo_scaled_font_reference ##### -->
<para>

</para>

@font: 


<!-- ##### FUNCTION cairo_scaled_font_destroy ##### -->
<para>

</para>

@font: 


<!-- ##### STRUCT cairo_font_extents_t ##### -->
<para>

</para>

@ascent: 
@descent: 
@height: 
@max_x_advance: 
@max_y_advance: 

<!-- ##### FUNCTION cairo_scaled_font_extents ##### -->
<para>

</para>

@font: 
@extents: 
@Returns: 


<!-- ##### STRUCT cairo_text_extents_t ##### -->
<para>

</para>

@x_bearing: 
@y_bearing: 
@width: 
@height: 
@x_advance: 
@y_advance: 

<!-- ##### FUNCTION cairo_scaled_font_glyph_extents ##### -->
<para>

</para>

@font: 
@glyphs: 
@num_glyphs: 
@extents: 



Index: cairo-ft.sgml
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/tmpl/cairo-ft.sgml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cairo-ft.sgml	10 Mar 2005 16:59:11 -0000	1.2
+++ cairo-ft.sgml	7 Apr 2005 18:04:00 -0000	1.3
@@ -17,50 +17,39 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_ft_font_create ##### -->
+<!-- ##### FUNCTION cairo_ft_font_face_create_for_pattern ##### -->
 <para>
 
 </para>
 
 @pattern: 
- at scale: 
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_ft_font_create_for_ft_face ##### -->
+<!-- ##### FUNCTION cairo_ft_font_face_create_for_ft_face ##### -->
 <para>
 
 </para>
 
 @face: 
 @load_flags: 
- at scale: 
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_ft_font_lock_face ##### -->
+<!-- ##### FUNCTION cairo_ft_scaled_font_lock_face ##### -->
 <para>
 
 </para>
 
- at ft_font: 
+ at scaled_font: 
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_ft_font_unlock_face ##### -->
-<para>
-
-</para>
-
- at ft_font: 
-
-
-<!-- ##### FUNCTION cairo_ft_font_get_pattern ##### -->
+<!-- ##### FUNCTION cairo_ft_scaled_font_unlock_face ##### -->
 <para>
 
 </para>
 
- at ft_font: 
- at Returns: 
+ at scaled_font: 
 
 

Index: cairo-matrix.sgml
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/tmpl/cairo-matrix.sgml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo-matrix.sgml	10 Mar 2005 16:59:11 -0000	1.3
+++ cairo-matrix.sgml	7 Apr 2005 18:04:00 -0000	1.4
@@ -41,11 +41,17 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_matrix_t ##### -->
+<!-- ##### STRUCT cairo_matrix_t ##### -->
 <para>
 
 </para>
 
+ at xx: 
+ at yx: 
+ at xy: 
+ at yy: 
+ at x0: 
+ at y0: 
 
 <!-- ##### FUNCTION cairo_matrix_create ##### -->
 <para>
@@ -70,23 +76,27 @@
 
 @matrix: 
 @other: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_matrix_set_identity ##### -->
+<!-- ##### MACRO cairo_matrix_set_identity ##### -->
 <para>
 
 </para>
 
- at matrix: 
 @Returns: 
+<!-- # Unused Parameters # -->
+ at matrix: 
 
 
-<!-- ##### FUNCTION cairo_matrix_set_affine ##### -->
+<!-- ##### MACRO cairo_matrix_set_affine ##### -->
 <para>
 
 </para>
 
+ at Returns: 
+<!-- # Unused Parameters # -->
 @matrix: 
 @a: 
 @b: 
@@ -94,8 +104,6 @@
 @d: 
 @tx: 
 @ty: 
- at Returns: 
-<!-- # Unused Parameters # -->
 @cr: 
 
 
@@ -111,6 +119,7 @@
 @d: 
 @tx: 
 @ty: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -122,6 +131,7 @@
 @matrix: 
 @tx: 
 @ty: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -133,6 +143,7 @@
 @matrix: 
 @sx: 
 @sy: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -143,6 +154,7 @@
 
 @matrix: 
 @radians: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -163,6 +175,7 @@
 @result: 
 @a: 
 @b: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -174,6 +187,7 @@
 @matrix: 
 @dx: 
 @dy: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -184,6 +198,7 @@
 @matrix: 
 @x: 
 @y: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 <!--

Index: cairo-pdf.sgml
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/tmpl/cairo-pdf.sgml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo-pdf.sgml	17 Mar 2005 20:57:42 -0000	1.3
+++ cairo-pdf.sgml	7 Apr 2005 18:04:00 -0000	1.4
@@ -23,48 +23,19 @@
 </para>
 
 @cr: 
- at write_func: 
- at destroy_closure_func: 
- at closure: 
- at width_inches: 
- at height_inches: 
- at x_pixels_per_inch: 
- at y_pixels_per_inch: 
-<!-- # Unused Parameters # -->
- at file: 
-
-
-<!-- ##### FUNCTION cairo_set_target_pdf_as_file ##### -->
-<para>
-
-</para>
-
- at cr: 
 @fp: 
 @width_inches: 
 @height_inches: 
 @x_pixels_per_inch: 
 @y_pixels_per_inch: 
-
-
-<!-- ##### FUNCTION cairo_pdf_surface_create ##### -->
-<para>
-
-</para>
-
+<!-- # Unused Parameters # -->
 @write_func: 
 @destroy_closure_func: 
 @closure: 
- at width_inches: 
- at height_inches: 
- at x_pixels_per_inch: 
- at y_pixels_per_inch: 
- at Returns: 
-<!-- # Unused Parameters # -->
 @file: 
 
 
-<!-- ##### FUNCTION cairo_pdf_surface_create_for_file ##### -->
+<!-- ##### FUNCTION cairo_pdf_surface_create ##### -->
 <para>
 
 </para>
@@ -75,5 +46,10 @@
 @x_pixels_per_inch: 
 @y_pixels_per_inch: 
 @Returns: 
+<!-- # Unused Parameters # -->
+ at write_func: 
+ at destroy_closure_func: 
+ at closure: 
+ at file: 
 
 

Index: cairo-png.sgml
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/tmpl/cairo-png.sgml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cairo-png.sgml	10 Mar 2005 16:59:11 -0000	1.2
+++ cairo-png.sgml	7 Apr 2005 18:04:00 -0000	1.3
@@ -17,27 +17,3 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_set_target_png ##### -->
-<para>
-
-</para>
-
- at cr: 
- at file: 
- at format: 
- at width: 
- at height: 
-
-
-<!-- ##### FUNCTION cairo_png_surface_create ##### -->
-<para>
-
-</para>
-
- at file: 
- at format: 
- at width: 
- at height: 
- at Returns: 
-
-

Index: cairo-surface.sgml
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/tmpl/cairo-surface.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cairo-surface.sgml	17 Mar 2005 20:57:42 -0000	1.5
+++ cairo-surface.sgml	7 Apr 2005 18:04:00 -0000	1.6
@@ -23,17 +23,18 @@
 </para>
 
 
-<!-- ##### FUNCTION cairo_surface_create_for_image ##### -->
+<!-- ##### MACRO cairo_surface_create_for_image ##### -->
 <para>
 
 </para>
 
+ at Returns: 
+<!-- # Unused Parameters # -->
 @data: 
 @format: 
 @width: 
 @height: 
 @stride: 
- at Returns: 
 
 
 <!-- ##### FUNCTION cairo_surface_create_similar ##### -->

Index: cairo.sgml
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/tmpl/cairo.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cairo.sgml	17 Mar 2005 20:57:42 -0000	1.5
+++ cairo.sgml	7 Apr 2005 18:04:00 -0000	1.6
@@ -292,11 +292,12 @@
 @angle: 
 
 
-<!-- ##### FUNCTION cairo_concat_matrix ##### -->
+<!-- ##### MACRO cairo_concat_matrix ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 @matrix: 
 
@@ -310,11 +311,12 @@
 @matrix: 
 
 
-<!-- ##### FUNCTION cairo_default_matrix ##### -->
+<!-- ##### MACRO cairo_default_matrix ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 
 
@@ -326,41 +328,45 @@
 @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 @@
 @y2: 
 
 
-<!-- ##### FUNCTION cairo_init_clip ##### -->
+<!-- ##### MACRO cairo_init_clip ##### -->
 <para>
 
 </para>
 
+<!-- # Unused Parameters # -->
 @cr: 
 
 
@@ -588,12 +595,6 @@
 @cr: 
 
 
-<!-- ##### TYPEDEF cairo_font_t ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT cairo_glyph_t ##### -->
 <para>
 
@@ -603,29 +604,6 @@
 @x: 
 @y: 
 
-<!-- ##### STRUCT cairo_text_extents_t ##### -->
-<para>
-
-</para>
-
- at x_bearing: 
- at y_bearing: 
- at width: 
- at height: 
- at x_advance: 
- at y_advance: 
-
-<!-- ##### STRUCT cairo_font_extents_t ##### -->
-<para>
-
-</para>
-
- at ascent: 
- at descent: 
- at height: 
- at max_x_advance: 
- at max_y_advance: 
-
 <!-- ##### ENUM cairo_font_slant_t ##### -->
 <para>
 
@@ -691,7 +669,7 @@
 @num_glyphs: 
 
 
-<!-- ##### FUNCTION cairo_get_font ##### -->
+<!-- ##### FUNCTION cairo_get_font_face ##### -->
 <para>
 
 </para>
@@ -700,22 +678,26 @@
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_get_font_extents ##### -->
+<!-- ##### FUNCTION cairo_font_extents ##### -->
 <para>
 
 </para>
 
 @cr: 
 @extents: 
+<!-- # Unused Parameters # -->
+ at font: 
+ at Returns: 
+ at font_matrix: 
 
 
-<!-- ##### FUNCTION cairo_set_font ##### -->
+<!-- ##### FUNCTION cairo_set_font_face ##### -->
 <para>
 
 </para>
 
 @cr: 
- at font: 
+ at font_face: 
 
 
 <!-- ##### FUNCTION cairo_text_extents ##### -->
@@ -758,45 +740,6 @@
 @num_glyphs: 
 
 
-<!-- ##### FUNCTION cairo_font_reference ##### -->
-<para>
-
-</para>
-
- at font: 
-
-
-<!-- ##### FUNCTION cairo_font_destroy ##### -->
-<para>
-
-</para>
-
- at font: 
-
-
-<!-- ##### FUNCTION cairo_font_extents ##### -->
-<para>
-
-</para>
-
- at font: 
- at font_matrix: 
- at extents: 
- at Returns: 
-
-
-<!-- ##### FUNCTION cairo_font_glyph_extents ##### -->
-<para>
-
-</para>
-
- at font: 
- at font_matrix: 
- at glyphs: 
- at num_glyphs: 
- at extents: 
-
-
 <!-- ##### FUNCTION cairo_show_surface ##### -->
 <para>
 
@@ -916,6 +859,8 @@
 </para>
 
 @cr: 
+ at Returns: 
+<!-- # Unused Parameters # -->
 @matrix: 
 
 
@@ -953,33 +898,6 @@
 @closure: 
 
 
-<!-- ##### FUNCTION cairo_copy_path_data ##### -->
-<para>
-
-</para>
-
- at cr: 
- at Returns: 
-
-
-<!-- ##### FUNCTION cairo_copy_path_data_flat ##### -->
-<para>
-
-</para>
-
- at cr: 
- at Returns: 
-
-
-<!-- ##### FUNCTION cairo_append_path_data ##### -->
-<para>
-
-</para>
-
- at cr: 
- at path_data: 
-
-
 <!-- ##### ENUM cairo_status_t ##### -->
 <para>

More information about the cairo-commit mailing list