diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-04-07 13:29:32 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@redhat.com> | 2005-04-07 13:29:32 +0000 |
| commit | ac6f15e2450e4e08d833355e626df0358d81c2ec (patch) | |
| tree | 60139fcd0fc144d11a34223cf0734460faf60cf0 /doc | |
| parent | 62212867d4228d5834ea16858a8569765977bdd9 (diff) | |
| download | cairo-ac6f15e2450e4e08d833355e626df0358d81c2ec.tar.gz | |
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/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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/public/cairo-sections.txt | 10 | ||||
| -rw-r--r-- | doc/public/tmpl/cairo-font.sgml | 12 | ||||
| -rw-r--r-- | doc/public/tmpl/cairo.sgml | 18 |
3 files changed, 31 insertions, 9 deletions
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt index 0b7c9398c..94ba4f8ab 100644 --- a/doc/public/cairo-sections.txt +++ b/doc/public/cairo-sections.txt @@ -215,9 +215,10 @@ cairo_clip cairo_glyph_t cairo_font_slant_t cairo_font_weight_t -cairo_select_font -cairo_scale_font -cairo_transform_font +cairo_select_font_face +cairo_set_font_size +cairo_set_font_matrix +cairo_get_font_matrix cairo_show_text cairo_show_glyphs cairo_get_font_face @@ -275,6 +276,9 @@ cairo_current_path cairo_current_path_flat cairo_current_font cairo_current_font_extents +cairo_scale_font +cairo_select_font +cairo_transform_font cairo_get_font_extents cairo_get_status cairo_get_status_string diff --git a/doc/public/tmpl/cairo-font.sgml b/doc/public/tmpl/cairo-font.sgml index 1c87ae347..cdf0ed288 100644 --- a/doc/public/tmpl/cairo-font.sgml +++ b/doc/public/tmpl/cairo-font.sgml @@ -61,6 +61,8 @@ Font Handling </para> +@scaled_font: +<!-- # Unused Parameters # --> @font: @@ -69,6 +71,8 @@ Font Handling </para> +@scaled_font: +<!-- # Unused Parameters # --> @font: @@ -88,9 +92,11 @@ Font Handling </para> -@font: +@scaled_font: @extents: @Returns: +<!-- # Unused Parameters # --> +@font: <!-- ##### STRUCT cairo_text_extents_t ##### --> @@ -110,9 +116,11 @@ Font Handling </para> -@font: +@scaled_font: @glyphs: @num_glyphs: @extents: +<!-- # Unused Parameters # --> +@font: diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml index 016ae5d39..6fb842ae6 100644 --- a/doc/public/tmpl/cairo.sgml +++ b/doc/public/tmpl/cairo.sgml @@ -621,7 +621,7 @@ Drawing contexts. @CAIRO_FONT_WEIGHT_NORMAL: @CAIRO_FONT_WEIGHT_BOLD: -<!-- ##### FUNCTION cairo_select_font ##### --> +<!-- ##### FUNCTION cairo_select_font_face ##### --> <para> </para> @@ -632,16 +632,16 @@ Drawing contexts. @weight: -<!-- ##### FUNCTION cairo_scale_font ##### --> +<!-- ##### FUNCTION cairo_set_font_size ##### --> <para> </para> @cr: -@scale: +@size: -<!-- ##### FUNCTION cairo_transform_font ##### --> +<!-- ##### FUNCTION cairo_set_font_matrix ##### --> <para> </para> @@ -650,6 +650,16 @@ Drawing contexts. @matrix: +<!-- ##### FUNCTION cairo_get_font_matrix ##### --> +<para> + +</para> + +@cr: +@matrix: +@Returns: + + <!-- ##### FUNCTION cairo_show_text ##### --> <para> |