[cairo-commit] cairo/doc/public/tmpl cairo-font.sgml, 1.1, 1.2 cairo.sgml, 1.6, 1.7

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	cairo-font.sgml cairo.sgml 
Log Message:
2005-04-07  Owen Taylor  <otaylor at redhat.com>

        * src/cairo.[ch] src/cairoint.h src/cairo-gstate.c
        docs/public/cairo-sections.txt:
        cairo_select_font() => cairo_select_font_face()
        cairo_scale_font() => cairo_set_font_size()
        cairo_transform_font() => cairo_set_font_matrix()
        Add cairo_get_font_matrix(). Make cairo_set_font_face()
        not reset the font matrix. Default the font matrix
        to SCALE(10). Document cairo_select_font_face().

        * test/coverage.c (draw) test/text-cache-crash.c (draw)
        test/text-rotate.c (draw): Use cairo_set_font_size().

        * src/cairo-font.c src/cairo.h: Fix up some parameter
        names for docs.


Index: cairo-font.sgml
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/tmpl/cairo-font.sgml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo-font.sgml	7 Apr 2005 18:04:00 -0000	1.1
+++ cairo-font.sgml	7 Apr 2005 20:29:32 -0000	1.2
@@ -61,6 +61,8 @@
 
 </para>
 
+ at scaled_font: 
+<!-- # Unused Parameters # -->
 @font: 
 
 
@@ -69,6 +71,8 @@
 
 </para>
 
+ at scaled_font: 
+<!-- # Unused Parameters # -->
 @font: 
 
 
@@ -88,9 +92,11 @@
 
 </para>
 
- at font: 
+ at scaled_font: 
 @extents: 
 @Returns: 
+<!-- # Unused Parameters # -->
+ at font: 
 
 
 <!-- ##### STRUCT cairo_text_extents_t ##### -->
@@ -110,9 +116,11 @@
 
 </para>
 
- at font: 
+ at scaled_font: 
 @glyphs: 
 @num_glyphs: 
 @extents: 
+<!-- # Unused Parameters # -->
+ at font: 
 
 

Index: cairo.sgml
===================================================================
RCS file: /cvs/cairo/cairo/doc/public/tmpl/cairo.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cairo.sgml	7 Apr 2005 18:04:00 -0000	1.6
+++ cairo.sgml	7 Apr 2005 20:29:32 -0000	1.7
@@ -621,7 +621,7 @@
 @CAIRO_FONT_WEIGHT_NORMAL: 
 @CAIRO_FONT_WEIGHT_BOLD: 
 
-<!-- ##### FUNCTION cairo_select_font ##### -->
+<!-- ##### FUNCTION cairo_select_font_face ##### -->
 <para>
 
 </para>
@@ -632,22 +632,32 @@
 @weight: 
 
 
-<!-- ##### FUNCTION cairo_scale_font ##### -->
+<!-- ##### FUNCTION cairo_set_font_size ##### -->
 <para>
 
 </para>
 
 @cr: 
- at scale: 
+ at size: 
 
 
-<!-- ##### FUNCTION cairo_transform_font ##### -->
+<!-- ##### FUNCTION cairo_set_font_matrix ##### -->
+<para>
+
+</para>
+
+ at cr: 
+ at matrix: 
+
+
+<!-- ##### FUNCTION cairo_get_font_matrix ##### -->
 <para>
 
 </para>
 
 @cr: 
 @matrix: 
+ at Returns: 
 
 
 <!-- ##### FUNCTION cairo_show_text ##### -->