From 35248a17fd2cb1f4ff2bf312c092f853551bb9eb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 7 May 2005 10:35:35 +0000 Subject: [PATCH] Update. --- ChangeLog | 4 ++ doc/public/cairo-sections.txt | 19 +------ doc/public/tmpl/cairo-glitz.sgml | 9 --- doc/public/tmpl/cairo-pdf.sgml | 33 ----------- doc/public/tmpl/cairo-ps.sgml | 13 ----- doc/public/tmpl/cairo-quartz.sgml | 11 ---- doc/public/tmpl/cairo-surface.sgml | 25 +++++---- doc/public/tmpl/cairo-xcb.sgml | 12 ---- doc/public/tmpl/cairo-xlib.sgml | 10 ---- doc/public/tmpl/cairo.sgml | 89 +++++++++--------------------- 10 files changed, 46 insertions(+), 179 deletions(-) diff --git a/ChangeLog b/ChangeLog index a40780241..44aa41a2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-05-07 Owen Taylor + + * doc/public/cairo-sections.txt: Update. + 2005-05-07 Carl Worth * src/cairo.h (cairo_set_alpha): Point to both diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt index 3706afeec..3121b32a4 100644 --- a/doc/public/cairo-sections.txt +++ b/doc/public/cairo-sections.txt @@ -16,15 +16,12 @@ cairo_ft_scaled_font_unlock_face
cairo-glitz Glitz backend -cairo_set_target_glitz cairo_glitz_surface_create
cairo-pdf PDF Backend -cairo_set_target_pdf -cairo_set_target_pdf_for_callback cairo_pdf_surface_create cairo_pdf_surface_create_for_callback
@@ -41,21 +38,18 @@ cairo_surface_write_to_png_stream
cairo-ps PS Backend -cairo_set_target_ps cairo_ps_surface_create
cairo-quartz Quartz Backend -cairo_set_target_quartz_context cairo_quartz_surface_create
cairo-win32 Microsoft Windows Backend -cairo_set_target_win32 cairo_win32_surface_create cairo_win32_font_face_create_for_logfontw cairo_win32_scaled_font_select_font @@ -66,14 +60,12 @@ cairo_win32_scaled_font_get_metrics_factor
cairo-xcb XCB Backend -cairo_set_target_xcb cairo_xcb_surface_create
cairo-xlib XLib Backend -cairo_set_target_drawable cairo_xlib_surface_create cairo_xlib_surface_create_for_pixmap cairo_xlib_surface_create_for_pixmap_with_visual @@ -175,10 +167,7 @@ cairo_destroy cairo_save cairo_restore cairo_copy -cairo_set_target_surface cairo_format_t -cairo_set_target_image -cairo_set_target_image_no_data cairo_operator_t cairo_set_operator cairo_set_source_rgb @@ -254,9 +243,7 @@ cairo_text_path cairo_glyph_path cairo_show_surface cairo_get_operator -cairo_get_rgb_color cairo_get_source -cairo_get_alpha cairo_get_tolerance cairo_get_current_point cairo_get_fill_rule @@ -265,7 +252,7 @@ cairo_get_line_cap cairo_get_line_join cairo_get_miter_limit cairo_get_matrix -cairo_get_target_surface +cairo_get_target cairo_get_path cairo_get_path_flat cairo_copy_path @@ -286,13 +273,10 @@ cairo_user_data_key_t cairo_read_func_t cairo_write_func_t -CAIRO_API_SHAKEUP_FLAG_DAY CAIRO_BEGIN_DECLS CAIRO_END_DECLS cairo_concat_matrix cairo_current_operator -cairo_current_rgb_color -cairo_current_alpha cairo_current_tolerance cairo_current_point cairo_current_fill_rule @@ -304,7 +288,6 @@ cairo_current_matrix cairo_current_target_surface cairo_current_path cairo_current_path_flat -cairo_current_font cairo_current_font_extents cairo_init_clip cairo_inverse_transform_point diff --git a/doc/public/tmpl/cairo-glitz.sgml b/doc/public/tmpl/cairo-glitz.sgml index cb8caf76a..9594d87a5 100644 --- a/doc/public/tmpl/cairo-glitz.sgml +++ b/doc/public/tmpl/cairo-glitz.sgml @@ -17,15 +17,6 @@ Glitz backend - - - - - -@cr: -@surface: - - diff --git a/doc/public/tmpl/cairo-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml index 291216ca0..8ff0ea17e 100644 --- a/doc/public/tmpl/cairo-pdf.sgml +++ b/doc/public/tmpl/cairo-pdf.sgml @@ -17,39 +17,6 @@ PDF Backend - - - - - -@cr: -@fp: -@width_inches: -@height_inches: -@x_pixels_per_inch: -@y_pixels_per_inch: - -@write_func: -@destroy_closure_func: -@closure: -@file: - - - - - - - -@cr: -@write_func: -@destroy_closure_func: -@closure: -@width_inches: -@height_inches: -@x_pixels_per_inch: -@y_pixels_per_inch: - - diff --git a/doc/public/tmpl/cairo-ps.sgml b/doc/public/tmpl/cairo-ps.sgml index 3fe540904..4cb4a0268 100644 --- a/doc/public/tmpl/cairo-ps.sgml +++ b/doc/public/tmpl/cairo-ps.sgml @@ -17,19 +17,6 @@ PS Backend - - - - - -@cr: -@file: -@width_inches: -@height_inches: -@x_pixels_per_inch: -@y_pixels_per_inch: - - diff --git a/doc/public/tmpl/cairo-quartz.sgml b/doc/public/tmpl/cairo-quartz.sgml index 44dd75c9f..c83de6c77 100644 --- a/doc/public/tmpl/cairo-quartz.sgml +++ b/doc/public/tmpl/cairo-quartz.sgml @@ -17,17 +17,6 @@ Quartz Backend - - - - - -@cr: -@context: -@width: -@height: - - diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml index b6b7217cd..e92935a6c 100644 --- a/doc/public/tmpl/cairo-surface.sgml +++ b/doc/public/tmpl/cairo-surface.sgml @@ -74,53 +74,58 @@ cairo_surface_t @Returns: - + +@Returns: + @surface: @repeat: -@Returns: - + +@Returns: + @surface: @matrix: -@Returns: - + +@Returns: + @surface: @matrix: -@Returns: - + +@Returns: + @surface: @filter: -@Returns: - + -@surface: @Returns: + +@surface: diff --git a/doc/public/tmpl/cairo-xcb.sgml b/doc/public/tmpl/cairo-xcb.sgml index e11406cea..416d71638 100644 --- a/doc/public/tmpl/cairo-xcb.sgml +++ b/doc/public/tmpl/cairo-xcb.sgml @@ -17,18 +17,6 @@ XCB Backend - - - - - -@cr: -@dpy: -@drawable: -@visual: -@format: - - diff --git a/doc/public/tmpl/cairo-xlib.sgml b/doc/public/tmpl/cairo-xlib.sgml index 64a7ca509..b4288074b 100644 --- a/doc/public/tmpl/cairo-xlib.sgml +++ b/doc/public/tmpl/cairo-xlib.sgml @@ -17,16 +17,6 @@ XLib Backend - - - - - -@cr: -@dpy: -@drawable: - - diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml index 4bd396160..06a5fba6d 100644 --- a/doc/public/tmpl/cairo.sgml +++ b/doc/public/tmpl/cairo.sgml @@ -38,6 +38,7 @@ Drawing contexts. +@target: @Returns: @@ -73,24 +74,16 @@ Drawing contexts. @cr: - + + @dest: @src: - - - - - -@cr: -@surface: - - @@ -101,46 +94,22 @@ Drawing contexts. @CAIRO_FORMAT_A8: @CAIRO_FORMAT_A1: - - - - - -@cr: -@data: -@format: -@width: -@height: -@stride: - - - - - - - -@cr: -@format: -@width: -@height: - - @CAIRO_OPERATOR_CLEAR: -@CAIRO_OPERATOR_SRC: -@CAIRO_OPERATOR_DST: +@CAIRO_OPERATOR_SOURCE: @CAIRO_OPERATOR_OVER: -@CAIRO_OPERATOR_OVER_REVERSE: @CAIRO_OPERATOR_IN: -@CAIRO_OPERATOR_IN_REVERSE: @CAIRO_OPERATOR_OUT: -@CAIRO_OPERATOR_OUT_REVERSE: @CAIRO_OPERATOR_ATOP: -@CAIRO_OPERATOR_ATOP_REVERSE: +@CAIRO_OPERATOR_DEST: +@CAIRO_OPERATOR_DEST_OVER: +@CAIRO_OPERATOR_DEST_IN: +@CAIRO_OPERATOR_DEST_OUT: +@CAIRO_OPERATOR_DEST_ATOP: @CAIRO_OPERATOR_XOR: @CAIRO_OPERATOR_ADD: @CAIRO_OPERATOR_SATURATE: @@ -842,6 +811,18 @@ Drawing contexts. @num_glyphs: + + + + + + +@cr: +@surface: +@width: +@height: + + @@ -851,17 +832,6 @@ Drawing contexts. @Returns: - - - - - -@cr: -@red: -@green: -@blue: - - @@ -871,15 +841,6 @@ Drawing contexts. @Returns: - - - - - -@cr: -@Returns: - - @@ -955,7 +916,7 @@ Drawing contexts. @Returns: - + @@ -964,11 +925,12 @@ Drawing contexts. @Returns: - + + @cr: @move_to: @line_to: @@ -977,11 +939,12 @@ Drawing contexts. @closure: - + + @cr: @move_to: @line_to: