diff options
Diffstat (limited to 'doc/public')
-rw-r--r-- | doc/public/Makefile.am | 4 | ||||
-rw-r--r-- | doc/public/cairo-sections.txt | 31 | ||||
-rw-r--r-- | doc/public/language-bindings.xml | 2 | ||||
-rw-r--r-- | doc/public/tmpl/cairo-font.sgml | 185 | ||||
-rw-r--r-- | doc/public/tmpl/cairo-ft.sgml | 9 | ||||
-rw-r--r-- | doc/public/tmpl/cairo-pattern.sgml | 23 | ||||
-rw-r--r-- | doc/public/tmpl/cairo-surface.sgml | 14 | ||||
-rw-r--r-- | doc/public/tmpl/cairo-xlib-xrender.sgml | 1 | ||||
-rw-r--r-- | doc/public/tmpl/cairo-xlib.sgml | 1 | ||||
-rw-r--r-- | doc/public/tmpl/cairo.sgml | 49 |
10 files changed, 314 insertions, 5 deletions
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am index 9e4c10365..a9faef844 100644 --- a/doc/public/Makefile.am +++ b/doc/public/Makefile.am @@ -21,11 +21,15 @@ CFILE_GLOB=$(top_srcdir)/src/*.c $(top_srcdir)/src/*.h # Headers to ignore IGNORE_HFILES= \ cairo-features.h \ + cairo-font-subset-private.h \ cairo-ft-private.h \ cairo-gstate-private.h \ + cairo-hash-private.h \ + cairo-meta-surface-private.h \ cairo-path-fixed-private.h \ cairo-private.h \ cairo-win32-private.h \ + cairo-xlib-private.h \ cairo-xlib-test.h \ cairoint.h \ cairo-wideint.h diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt index 4db600b2a..2e237b020 100644 --- a/doc/public/cairo-sections.txt +++ b/doc/public/cairo-sections.txt @@ -1,6 +1,7 @@ <SECTION> <FILE>cairo-ft</FILE> <TITLE>FreeType Fonts</TITLE> +cairo_ft_font_options_substitute cairo_ft_font_face_create_for_pattern cairo_ft_font_face_create_for_ft_face cairo_ft_scaled_font_lock_face @@ -90,6 +91,7 @@ cairo_surface_create_similar cairo_surface_reference cairo_surface_destroy cairo_surface_finish +cairo_surface_get_font_options cairo_surface_set_user_data cairo_surface_get_user_data cairo_surface_set_device_offset @@ -99,6 +101,8 @@ cairo_surface_set_device_offset <FILE>cairo-pattern</FILE> <TITLE>cairo_pattern_t</TITLE> cairo_pattern_t +cairo_pattern_create_rgb +cairo_pattern_create_rgba cairo_pattern_create_for_surface cairo_pattern_create_linear cairo_pattern_create_radial @@ -150,6 +154,26 @@ cairo_font_extents_t cairo_scaled_font_extents cairo_text_extents_t cairo_scaled_font_glyph_extents +cairo_font_options_t +cairo_font_options_create +cairo_font_options_copy +cairo_font_options_destroy +cairo_font_options_status +cairo_font_options_merge +cairo_font_options_hash +cairo_font_options_equal +cairo_antialias_t +cairo_font_options_set_antialias +cairo_font_options_get_antialias +cairo_subpixel_order_t +cairo_font_options_set_subpixel_order +cairo_font_options_get_subpixel_order +cairo_hint_style_t +cairo_font_options_set_hint_style +cairo_font_options_get_hint_style +cairo_hint_metrics_t +cairo_font_options_set_hint_metrics +cairo_font_options_get_hint_metrics </SECTION> <SECTION> @@ -161,7 +185,10 @@ cairo_reference cairo_destroy cairo_save cairo_restore +cairo_content_t +CAIRO_CONTENT_VALID cairo_format_t +CAIRO_FORMAT_VALID cairo_operator_t cairo_set_operator cairo_set_source_rgb @@ -224,6 +251,8 @@ cairo_select_font_face cairo_set_font_size cairo_set_font_matrix cairo_get_font_matrix +cairo_set_font_options +cairo_get_font_options cairo_show_text cairo_show_glyphs cairo_get_font_face @@ -255,8 +284,6 @@ cairo_status_t cairo_status cairo_status_string cairo_status_to_string -cairo_error_notify_func_t -cairo_set_error_notify cairo_filter_t cairo_image_surface_create cairo_image_surface_create_for_data diff --git a/doc/public/language-bindings.xml b/doc/public/language-bindings.xml index b0ee8e879..26b98e1be 100644 --- a/doc/public/language-bindings.xml +++ b/doc/public/language-bindings.xml @@ -47,7 +47,7 @@ <title>Memory Management</title> <para> The objects in cairo can roughly be divided into two types: - refcounted opaque types like + reference-counted, opaque types like <link linkend="cairo-surface-t"><type>cairo_surface_t</type></link> and plain structures like diff --git a/doc/public/tmpl/cairo-font.sgml b/doc/public/tmpl/cairo-font.sgml index d6c7043d2..a41b7ccea 100644 --- a/doc/public/tmpl/cairo-font.sgml +++ b/doc/public/tmpl/cairo-font.sgml @@ -75,6 +75,7 @@ Font Handling @font_face: @font_matrix: @ctm: +@options: @Returns: @@ -112,6 +113,7 @@ Font Handling @scaled_font: @extents: +<!-- # Unused Parameters # --> @Returns: @@ -138,3 +140,186 @@ Font Handling @extents: +<!-- ##### TYPEDEF cairo_font_options_t ##### --> +<para> + +</para> + + +<!-- ##### FUNCTION cairo_font_options_create ##### --> +<para> + +</para> + +@Returns: + + +<!-- ##### FUNCTION cairo_font_options_copy ##### --> +<para> + +</para> + +@original: +@Returns: + + +<!-- ##### FUNCTION cairo_font_options_destroy ##### --> +<para> + +</para> + +@options: + + +<!-- ##### FUNCTION cairo_font_options_status ##### --> +<para> + +</para> + +@options: +@Returns: + + +<!-- ##### FUNCTION cairo_font_options_merge ##### --> +<para> + +</para> + +@options: +@other: + + +<!-- ##### FUNCTION cairo_font_options_hash ##### --> +<para> + +</para> + +@options: +@Returns: + + +<!-- ##### FUNCTION cairo_font_options_equal ##### --> +<para> + +</para> + +@options: +@other: +@Returns: + + +<!-- ##### ENUM cairo_antialias_t ##### --> +<para> + +</para> + +@CAIRO_ANTIALIAS_DEFAULT: +@CAIRO_ANTIALIAS_NONE: +@CAIRO_ANTIALIAS_GRAY: +@CAIRO_ANTIALIAS_SUBPIXEL: + +<!-- ##### FUNCTION cairo_font_options_set_antialias ##### --> +<para> + +</para> + +@options: +@antialias: + + +<!-- ##### FUNCTION cairo_font_options_get_antialias ##### --> +<para> + +</para> + +@options: +@Returns: + + +<!-- ##### ENUM cairo_subpixel_order_t ##### --> +<para> + +</para> + +@CAIRO_SUBPIXEL_ORDER_DEFAULT: +@CAIRO_SUBPIXEL_ORDER_RGB: +@CAIRO_SUBPIXEL_ORDER_BGR: +@CAIRO_SUBPIXEL_ORDER_VRGB: +@CAIRO_SUBPIXEL_ORDER_VBGR: + +<!-- ##### FUNCTION cairo_font_options_set_subpixel_order ##### --> +<para> + +</para> + +@options: +@subpixel_order: + + +<!-- ##### FUNCTION cairo_font_options_get_subpixel_order ##### --> +<para> + +</para> + +@options: +@Returns: +<!-- # Unused Parameters # --> +@option: + + +<!-- ##### ENUM cairo_hint_style_t ##### --> +<para> + +</para> + +@CAIRO_HINT_STYLE_DEFAULT: +@CAIRO_HINT_STYLE_NONE: +@CAIRO_HINT_STYLE_SLIGHT: +@CAIRO_HINT_STYLE_MEDIUM: +@CAIRO_HINT_STYLE_FULL: + +<!-- ##### FUNCTION cairo_font_options_set_hint_style ##### --> +<para> + +</para> + +@options: +@hint_style: + + +<!-- ##### FUNCTION cairo_font_options_get_hint_style ##### --> +<para> + +</para> + +@options: +@Returns: + + +<!-- ##### ENUM cairo_hint_metrics_t ##### --> +<para> + +</para> + +@CAIRO_HINT_METRICS_DEFAULT: +@CAIRO_HINT_METRICS_OFF: +@CAIRO_HINT_METRICS_ON: + +<!-- ##### FUNCTION cairo_font_options_set_hint_metrics ##### --> +<para> + +</para> + +@options: +@hint_metrics: + + +<!-- ##### FUNCTION cairo_font_options_get_hint_metrics ##### --> +<para> + +</para> + +@options: +@Returns: + + diff --git a/doc/public/tmpl/cairo-ft.sgml b/doc/public/tmpl/cairo-ft.sgml index d9f7cbfc1..383cf1935 100644 --- a/doc/public/tmpl/cairo-ft.sgml +++ b/doc/public/tmpl/cairo-ft.sgml @@ -17,6 +17,15 @@ FreeType Fonts <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### FUNCTION cairo_ft_font_options_substitute ##### --> +<para> + +</para> + +@options: +@pattern: + + <!-- ##### FUNCTION cairo_ft_font_face_create_for_pattern ##### --> <para> diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml index dadd7870c..a837252c6 100644 --- a/doc/public/tmpl/cairo-pattern.sgml +++ b/doc/public/tmpl/cairo-pattern.sgml @@ -23,6 +23,29 @@ cairo_pattern_t </para> +<!-- ##### FUNCTION cairo_pattern_create_rgb ##### --> +<para> + +</para> + +@red: +@green: +@blue: +@Returns: + + +<!-- ##### FUNCTION cairo_pattern_create_rgba ##### --> +<para> + +</para> + +@red: +@green: +@blue: +@alpha: +@Returns: + + <!-- ##### FUNCTION cairo_pattern_create_for_surface ##### --> <para> diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml index fab1306f6..5d069fc2c 100644 --- a/doc/public/tmpl/cairo-surface.sgml +++ b/doc/public/tmpl/cairo-surface.sgml @@ -29,10 +29,12 @@ cairo_surface_t </para> @other: -@format: +@content: @width: @height: @Returns: +<!-- # Unused Parameters # --> +@format: <!-- ##### FUNCTION cairo_surface_reference ##### --> @@ -57,9 +59,19 @@ cairo_surface_t </para> @surface: +<!-- # Unused Parameters # --> @Returns: +<!-- ##### FUNCTION cairo_surface_get_font_options ##### --> +<para> + +</para> + +@surface: +@options: + + <!-- ##### FUNCTION cairo_surface_set_user_data ##### --> <para> diff --git a/doc/public/tmpl/cairo-xlib-xrender.sgml b/doc/public/tmpl/cairo-xlib-xrender.sgml index 4ceab1968..398900e88 100644 --- a/doc/public/tmpl/cairo-xlib-xrender.sgml +++ b/doc/public/tmpl/cairo-xlib-xrender.sgml @@ -24,6 +24,7 @@ XLib/Xrender Backend @dpy: @drawable: +@screen: @format: @width: @height: diff --git a/doc/public/tmpl/cairo-xlib.sgml b/doc/public/tmpl/cairo-xlib.sgml index ae8bb785c..cc106e8c5 100644 --- a/doc/public/tmpl/cairo-xlib.sgml +++ b/doc/public/tmpl/cairo-xlib.sgml @@ -37,6 +37,7 @@ XLib Backend @dpy: @bitmap: +@screen: @width: @height: @Returns: diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml index 992ace500..c3398425f 100644 --- a/doc/public/tmpl/cairo.sgml +++ b/doc/public/tmpl/cairo.sgml @@ -74,6 +74,23 @@ Drawing contexts. @cr: +<!-- ##### ENUM cairo_content_t ##### --> +<para> + +</para> + +@CAIRO_CONTENT_COLOR: +@CAIRO_CONTENT_ALPHA: +@CAIRO_CONTENT_COLOR_ALPHA: + +<!-- ##### MACRO CAIRO_CONTENT_VALID ##### --> +<para> + +</para> + +@content: + + <!-- ##### ENUM cairo_format_t ##### --> <para> @@ -84,6 +101,14 @@ Drawing contexts. @CAIRO_FORMAT_A8: @CAIRO_FORMAT_A1: +<!-- ##### MACRO CAIRO_FORMAT_VALID ##### --> +<para> + +</para> + +@format: + + <!-- ##### ENUM cairo_operator_t ##### --> <para> @@ -689,6 +714,24 @@ Drawing contexts. @matrix: +<!-- ##### FUNCTION cairo_set_font_options ##### --> +<para> + +</para> + +@cr: +@options: + + +<!-- ##### FUNCTION cairo_get_font_options ##### --> +<para> + +</para> + +@cr: +@options: + + <!-- ##### FUNCTION cairo_show_text ##### --> <para> @@ -942,7 +985,7 @@ Drawing contexts. @CAIRO_STATUS_INVALID_POP_GROUP: @CAIRO_STATUS_NO_CURRENT_POINT: @CAIRO_STATUS_INVALID_MATRIX: -@CAIRO_STATUS_NO_TARGET_SURFACE: +@CAIRO_STATUS_INVALID_STATUS: @CAIRO_STATUS_NULL_POINTER: @CAIRO_STATUS_INVALID_STRING: @CAIRO_STATUS_INVALID_PATH_DATA: @@ -951,6 +994,10 @@ Drawing contexts. @CAIRO_STATUS_SURFACE_FINISHED: @CAIRO_STATUS_SURFACE_TYPE_MISMATCH: @CAIRO_STATUS_PATTERN_TYPE_MISMATCH: +@CAIRO_STATUS_INVALID_CONTENT: +@CAIRO_STATUS_INVALID_FORMAT: +@CAIRO_STATUS_INVALID_VISUAL: +@CAIRO_STATUS_FILE_NOT_FOUND: <!-- ##### FUNCTION cairo_status ##### --> <para> |