Remove pixman from SNAPSHOT_0_5_1SNAPSHOT_0_5_1

16 files changed, 311 insertions, 277 deletions

diff --git a/doc/public/.cvsignore b/doc/public/.cvsignore
index 35479d5e3..ff4418d10 100644
--- a/doc/public/.cvsignore
+++ b/doc/public/.cvsignore
@@ -3,6 +3,7 @@ Makefile
 Makefile.in
 cairo-decl-list.txt
 cairo-decl.txt
+cairo-docs.sgml
 cairo-undocumented.txt
 cairo-unused.txt
 cairo.hierarchy
@@ -13,3 +14,5 @@ cairo.signals
 html
 xml
 
+
+
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index f058d36aa..9e4c10365 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -38,6 +38,9 @@ GTKDOC_LIBS =
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
+# Extra options to supply to gtkdoc-mktmpl
+MKTMPL_OPTIONS=
+
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files =					\
 	language-bindings.xml
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index b462436b8..4db600b2a 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -1,10 +1,4 @@
 <SECTION>
-<FILE>cairo-atsui</FILE>
-<TITLE>ATSUI Fonts</TITLE>
-cairo_atsui_font_create
-</SECTION>
-
-<SECTION>
 <FILE>cairo-ft</FILE>
 <TITLE>FreeType Fonts</TITLE>
 cairo_ft_font_face_create_for_pattern
@@ -23,7 +17,8 @@ cairo_glitz_surface_create
 <FILE>cairo-pdf</FILE>
 <TITLE>PDF Backend</TITLE>
 cairo_pdf_surface_create
-cairo_pdf_surface_create_for_callback
+cairo_pdf_surface_create_for_stream
+cairo_pdf_surface_set_dpi
 </SECTION>
 
 <SECTION>
@@ -39,6 +34,8 @@ cairo_surface_write_to_png_stream
 <FILE>cairo-ps</FILE>
 <TITLE>PS Backend</TITLE>
 cairo_ps_surface_create
+cairo_ps_surface_create_for_stream
+cairo_ps_surface_set_dpi
 </SECTION>
 
 <SECTION>
@@ -61,30 +58,38 @@ cairo_win32_scaled_font_get_metrics_factor
 <FILE>cairo-xcb</FILE>
 <TITLE>XCB Backend</TITLE>
 cairo_xcb_surface_create
+cairo_xcb_surface_create_for_bitmap
+cairo_xcb_surface_set_size
+</SECTION>
+
+<SECTION>
+<FILE>cairo-xcb-xrender</FILE>
+<TITLE>XCB Backend</TITLE>
+cairo_xcb_surface_create_with_xrender_format
 </SECTION>
 
 <SECTION>
 <FILE>cairo-xlib</FILE>
 <TITLE>XLib Backend</TITLE>
 cairo_xlib_surface_create
-cairo_xlib_surface_create_with_visual
+cairo_xlib_surface_create_for_bitmap
 cairo_xlib_surface_set_size
 </SECTION>
 
 <SECTION>
+<FILE>cairo-xlib-xrender</FILE>
+<TITLE>XLib/Xrender Backend</TITLE>
+cairo_xlib_surface_create_with_xrender_format
+</SECTION>
+
+<SECTION>
 <FILE>cairo-surface</FILE>
 <TITLE>cairo_surface_t</TITLE>
 cairo_surface_t
-cairo_surface_create_for_image
 cairo_surface_create_similar
 cairo_surface_reference
 cairo_surface_destroy
 cairo_surface_finish
-cairo_surface_set_repeat
-cairo_surface_set_matrix
-cairo_surface_get_matrix
-cairo_surface_set_filter
-cairo_surface_get_filter
 cairo_surface_set_user_data
 cairo_surface_get_user_data
 cairo_surface_set_device_offset
@@ -99,6 +104,7 @@ cairo_pattern_create_linear
 cairo_pattern_create_radial
 cairo_pattern_reference
 cairo_pattern_destroy
+cairo_pattern_status
 cairo_pattern_add_color_stop_rgb
 cairo_pattern_add_color_stop_rgba
 cairo_pattern_set_matrix
@@ -108,8 +114,6 @@ cairo_pattern_set_extend
 cairo_pattern_get_extend
 cairo_pattern_set_filter
 cairo_pattern_get_filter
-<SUBSECTION Private>
-cairo_pattern_add_color_stop
 </SECTION>
 
 <SECTION>
@@ -128,13 +132,6 @@ cairo_matrix_invert
 cairo_matrix_multiply
 cairo_matrix_transform_distance
 cairo_matrix_transform_point
-<SUBSECTION Private>
-cairo_matrix_create
-cairo_matrix_destroy
-cairo_matrix_copy
-cairo_matrix_set_identity
-cairo_matrix_set_affine
-cairo_matrix_get_affine
 </SECTION>
 
 <SECTION>
@@ -164,7 +161,6 @@ cairo_reference
 cairo_destroy
 cairo_save
 cairo_restore
-cairo_copy
 cairo_format_t
 cairo_operator_t
 cairo_set_operator
@@ -172,7 +168,6 @@ cairo_set_source_rgb
 cairo_set_source_rgba
 cairo_set_source
 cairo_set_source_surface
-cairo_set_alpha
 cairo_set_tolerance
 cairo_fill_rule_t
 cairo_set_fill_rule
@@ -188,7 +183,6 @@ cairo_scale
 cairo_rotate
 cairo_transform
 cairo_set_matrix
-cairo_default_matrix
 cairo_identity_matrix
 cairo_user_to_device
 cairo_user_to_device_distance
@@ -239,7 +233,6 @@ cairo_text_extents
 cairo_glyph_extents
 cairo_text_path
 cairo_glyph_path
-cairo_show_surface
 cairo_get_operator
 cairo_get_source
 cairo_get_tolerance
@@ -251,16 +244,19 @@ cairo_get_line_join
 cairo_get_miter_limit
 cairo_get_matrix
 cairo_get_target
-cairo_get_path
-cairo_get_path_flat
 cairo_copy_path
 cairo_copy_path_flat
 cairo_append_path
+cairo_path_data_type_t
+cairo_path_data_t
 cairo_path_t
 cairo_path_destroy
 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
@@ -273,7 +269,8 @@ cairo_write_func_t
 <SUBSECTION Private>
 CAIRO_BEGIN_DECLS
 CAIRO_END_DECLS
-cairo_concat_matrix
+cairo_current_font_extents
+cairo_get_font_extents
 cairo_current_operator
 cairo_current_tolerance
 cairo_current_point
@@ -284,20 +281,54 @@ cairo_current_line_join
 cairo_current_miter_limit
 cairo_current_matrix
 cairo_current_target_surface
-cairo_current_path
-cairo_current_path_flat
-cairo_current_font_extents
-cairo_init_clip
-cairo_inverse_transform_point
-cairo_inverse_transform_distance
+cairo_get_status
+cairo_get_status_string
+cairo_concat_matrix
 cairo_scale_font
 cairo_select_font
-cairo_set_pattern
-cairo_set_rgb_color
 cairo_transform_font
-cairo_get_font_extents
-cairo_get_status
-cairo_get_status_string
 cairo_transform_point
 cairo_transform_distance
+cairo_inverse_transform_point
+cairo_inverse_transform_distance
+cairo_init_clip
+cairo_surface_create_for_image
+cairo_default_matrix
+cairo_matrix_set_affine
+cairo_matrix_set_identity
+cairo_pattern_add_color_stop
+cairo_set_rgb_color
+cairo_set_pattern
+cairo_xlib_surface_create_for_pixmap_with_visual
+cairo_xlib_surface_create_for_window_with_visual
+cairo_xcb_surface_create_for_pixmap_with_visual
+cairo_xcb_surface_create_for_window_with_visual
+cairo_current_path
+cairo_current_path_flat
+cairo_get_path
+cairo_get_path_flat
+cairo_set_alpha
+cairo_show_surface
+cairo_copy
+cairo_surface_set_repeat
+cairo_surface_set_matrix
+cairo_surface_get_matrix
+cairo_surface_set_filter
+cairo_surface_get_filter
+cairo_matrix_create
+cairo_matrix_destroy
+cairo_matrix_copy
+cairo_matrix_set_identity
+cairo_matrix_set_affine
+cairo_matrix_get_affine
+cairo_set_target_surface
+cairo_set_target_glitz
+cairo_set_target_image
+cairo_set_target_pdf
+cairo_set_target_png
+cairo_set_target_ps
+cairo_set_target_quartz
+cairo_set_target_win32
+cairo_set_target_xcb
+cairo_set_target_drawable
 </SECTION>
diff --git a/doc/public/tmpl/cairo-atsui.sgml b/doc/public/tmpl/cairo-atsui.sgml
index a47ee8c68..4a8b35aaf 100644
--- a/doc/public/tmpl/cairo-atsui.sgml
+++ b/doc/public/tmpl/cairo-atsui.sgml
@@ -17,12 +17,3 @@ ATSUI Fonts
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_atsui_font_create ##### -->
-<para>
-
-</para>
-
-@style: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-font.sgml b/doc/public/tmpl/cairo-font.sgml
index 66502930e..d6c7043d2 100644
--- a/doc/public/tmpl/cairo-font.sgml
+++ b/doc/public/tmpl/cairo-font.sgml
@@ -84,8 +84,6 @@ Font Handling
 </para>
 
 @scaled_font: 
-<!-- # Unused Parameters # -->
-@font: 
 
 
 <!-- ##### FUNCTION cairo_scaled_font_destroy ##### -->
@@ -94,8 +92,6 @@ Font Handling
 </para>
 
 @scaled_font: 
-<!-- # Unused Parameters # -->
-@font: 
 
 
 <!-- ##### STRUCT cairo_font_extents_t ##### -->
@@ -117,8 +113,6 @@ Font Handling
 @scaled_font: 
 @extents: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@font: 
 
 
 <!-- ##### STRUCT cairo_text_extents_t ##### -->
@@ -142,7 +136,5 @@ Font Handling
 @glyphs: 
 @num_glyphs: 
 @extents: 
-<!-- # Unused Parameters # -->
-@font: 
 
 
diff --git a/doc/public/tmpl/cairo-matrix.sgml b/doc/public/tmpl/cairo-matrix.sgml
index c58abe488..d9549b4a6 100644
--- a/doc/public/tmpl/cairo-matrix.sgml
+++ b/doc/public/tmpl/cairo-matrix.sgml
@@ -65,14 +65,6 @@ cairo_matrix_t
 @yy: 
 @x0: 
 @y0: 
-<!-- # Unused Parameters # -->
-@Param7: 
-@a: 
-@b: 
-@c: 
-@d: 
-@tx: 
-@ty: 
 
 
 <!-- ##### FUNCTION cairo_matrix_init_identity ##### -->
@@ -120,8 +112,6 @@ cairo_matrix_t
 @matrix: 
 @tx: 
 @ty: 
-<!-- # Unused Parameters # -->
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_matrix_scale ##### -->
@@ -132,8 +122,6 @@ cairo_matrix_t
 @matrix: 
 @sx: 
 @sy: 
-<!-- # Unused Parameters # -->
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_matrix_rotate ##### -->
@@ -143,8 +131,6 @@ cairo_matrix_t
 
 @matrix: 
 @radians: 
-<!-- # Unused Parameters # -->
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_matrix_invert ##### -->
@@ -164,8 +150,6 @@ cairo_matrix_t
 @result: 
 @a: 
 @b: 
-<!-- # Unused Parameters # -->
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_matrix_transform_distance ##### -->
@@ -176,25 +160,15 @@ cairo_matrix_t
 @matrix: 
 @dx: 
 @dy: 
-<!-- # Unused Parameters # -->
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_matrix_transform_point ##### -->
 <para>
+
 </para>
 
 @matrix: 
 @x: 
 @y: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../cairo-docs.xml" "book" "refsect2" "")
-End:
--->
 
 
diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml
index 30deec9b8..dadd7870c 100644
--- a/doc/public/tmpl/cairo-pattern.sgml
+++ b/doc/public/tmpl/cairo-pattern.sgml
@@ -74,6 +74,15 @@ cairo_pattern_t
 @pattern: 
 
 
+<!-- ##### FUNCTION cairo_pattern_status ##### -->
+<para>
+
+</para>
+
+@pattern: 
+@Returns: 
+
+
 <!-- ##### FUNCTION cairo_pattern_add_color_stop_rgb ##### -->
 <para>
 
@@ -84,7 +93,6 @@ cairo_pattern_t
 @red: 
 @green: 
 @blue: 
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_pattern_add_color_stop_rgba ##### -->
@@ -98,7 +106,6 @@ cairo_pattern_t
 @green: 
 @blue: 
 @alpha: 
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_pattern_set_matrix ##### -->
@@ -108,7 +115,6 @@ cairo_pattern_t
 
 @pattern: 
 @matrix: 
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_pattern_get_matrix ##### -->
@@ -118,6 +124,7 @@ cairo_pattern_t
 
 @pattern: 
 @matrix: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -137,7 +144,6 @@ cairo_pattern_t
 
 @pattern: 
 @extend: 
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_pattern_get_extend ##### -->
@@ -156,7 +162,6 @@ cairo_pattern_t
 
 @pattern: 
 @filter: 
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_pattern_get_filter ##### -->
diff --git a/doc/public/tmpl/cairo-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml
index 8ff0ea17e..d29ed0e26 100644
--- a/doc/public/tmpl/cairo-pdf.sgml
+++ b/doc/public/tmpl/cairo-pdf.sgml
@@ -22,31 +22,31 @@ PDF Backend
 
 </para>
 
-@fp: 
-@width_inches: 
-@height_inches: 
-@x_pixels_per_inch: 
-@y_pixels_per_inch: 
+@filename: 
+@width_in_points: 
+@height_in_points: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@write_func: 
-@destroy_closure_func: 
-@closure: 
-@file: 
 
 
-<!-- ##### FUNCTION cairo_pdf_surface_create_for_callback ##### -->
+<!-- ##### FUNCTION cairo_pdf_surface_create_for_stream ##### -->
 <para>
 
 </para>
 
 @write_func: 
-@destroy_closure_func: 
 @closure: 
-@width_inches: 
-@height_inches: 
-@x_pixels_per_inch: 
-@y_pixels_per_inch: 
+@width_in_points: 
+@height_in_points: 
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_pdf_surface_set_dpi ##### -->
+<para>
+
+</para>
+
+@surface: 
+@x_dpi: 
+@y_dpi: 
+
+
diff --git a/doc/public/tmpl/cairo-ps.sgml b/doc/public/tmpl/cairo-ps.sgml
index 4cb4a0268..4c5e8b37b 100644
--- a/doc/public/tmpl/cairo-ps.sgml
+++ b/doc/public/tmpl/cairo-ps.sgml
@@ -22,11 +22,31 @@ PS Backend
 
 </para>
 
-@file: 
-@width_inches: 
-@height_inches: 
-@x_pixels_per_inch: 
-@y_pixels_per_inch: 
+@filename: 
+@width_in_points: 
+@height_in_points: 
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_ps_surface_create_for_stream ##### -->
+<para>
+
+</para>
+
+@write_func: 
+@closure: 
+@width_in_points: 
+@height_in_points: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_ps_surface_set_dpi ##### -->
+<para>
+
+</para>
+
+@surface: 
+@x_dpi: 
+@y_dpi: 
+
+
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index e92935a6c..fab1306f6 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -23,20 +23,6 @@ cairo_surface_t
 </para>
 
 
-<!-- ##### MACRO cairo_surface_create_for_image ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@data: 
-@format: 
-@width: 
-@height: 
-@stride: 
-
-
 <!-- ##### FUNCTION cairo_surface_create_similar ##### -->
 <para>
 
@@ -74,60 +60,6 @@ cairo_surface_t
 @Returns: 
 
 
-<!-- ##### MACRO cairo_surface_set_repeat ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-@repeat: 
-
-
-<!-- ##### MACRO cairo_surface_set_matrix ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-@matrix: 
-
-
-<!-- ##### MACRO cairo_surface_get_matrix ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-@matrix: 
-
-
-<!-- ##### MACRO cairo_surface_set_filter ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-@filter: 
-
-
-<!-- ##### MACRO cairo_surface_get_filter ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-
-
 <!-- ##### FUNCTION cairo_surface_set_user_data ##### -->
 <para>
 
@@ -138,8 +70,6 @@ cairo_surface_t
 @user_data: 
 @destroy: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@data: 
 
 
 <!-- ##### FUNCTION cairo_surface_get_user_data ##### -->
diff --git a/doc/public/tmpl/cairo-win32.sgml b/doc/public/tmpl/cairo-win32.sgml
new file mode 100644
index 000000000..4976ea064
--- /dev/null
+++ b/doc/public/tmpl/cairo-win32.sgml
@@ -0,0 +1,64 @@
+<!-- ##### SECTION Title ##### -->
+Microsoft Windows Backend
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### FUNCTION cairo_win32_surface_create ##### -->
+<para>
+
+</para>
+
+@hdc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_win32_font_face_create_for_logfontw ##### -->
+<para>
+
+</para>
+
+@logfont: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_win32_scaled_font_select_font ##### -->
+<para>
+
+</para>
+
+@scaled_font: 
+@hdc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_win32_scaled_font_done_font ##### -->
+<para>
+
+</para>
+
+@scaled_font: 
+
+
+<!-- ##### FUNCTION cairo_win32_scaled_font_get_metrics_factor ##### -->
+<para>
+
+</para>
+
+@scaled_font: 
+@Returns: 
+
+
diff --git a/doc/public/tmpl/cairo-xcb-xrender.sgml b/doc/public/tmpl/cairo-xcb-xrender.sgml
new file mode 100644
index 000000000..892967ec0
--- /dev/null
+++ b/doc/public/tmpl/cairo-xcb-xrender.sgml
@@ -0,0 +1,32 @@
+<!-- ##### SECTION Title ##### -->
+XCB Backend
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### FUNCTION cairo_xcb_surface_create_with_xrender_format ##### -->
+<para>
+
+</para>
+
+@c: 
+@drawable: 
+@format: 
+@width: 
+@height: 
+@Returns: 
+
+
diff --git a/doc/public/tmpl/cairo-xcb.sgml b/doc/public/tmpl/cairo-xcb.sgml
index 416d71638..a58912c75 100644
--- a/doc/public/tmpl/cairo-xcb.sgml
+++ b/doc/public/tmpl/cairo-xcb.sgml
@@ -22,10 +22,33 @@ XCB Backend
 
 </para>
 
-@dpy: 
+@c: 
 @drawable: 
 @visual: 
-@format: 
+@width: 
+@height: 
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_xcb_surface_create_for_bitmap ##### -->
+<para>
+
+</para>
+
+@c: 
+@bitmap: 
+@width: 
+@height: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_xcb_surface_set_size ##### -->
+<para>
+
+</para>
+
+@surface: 
+@width: 
+@height: 
+
+
diff --git a/doc/public/tmpl/cairo-xlib-xrender.sgml b/doc/public/tmpl/cairo-xlib-xrender.sgml
new file mode 100644
index 000000000..4ceab1968
--- /dev/null
+++ b/doc/public/tmpl/cairo-xlib-xrender.sgml
@@ -0,0 +1,32 @@
+<!-- ##### SECTION Title ##### -->
+XLib/Xrender Backend
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### FUNCTION cairo_xlib_surface_create_with_xrender_format ##### -->
+<para>
+
+</para>
+
+@dpy: 
+@drawable: 
+@format: 
+@width: 
+@height: 
+@Returns: 
+
+
diff --git a/doc/public/tmpl/cairo-xlib.sgml b/doc/public/tmpl/cairo-xlib.sgml
index 30282b226..ae8bb785c 100644
--- a/doc/public/tmpl/cairo-xlib.sgml
+++ b/doc/public/tmpl/cairo-xlib.sgml
@@ -24,21 +24,21 @@ XLib Backend
 
 @dpy: 
 @drawable: 
-@format: 
-@Returns: 
-<!-- # Unused Parameters # -->
 @visual: 
-@colormap: 
+@width: 
+@height: 
+@Returns: 
 
 
-<!-- ##### FUNCTION cairo_xlib_surface_create_with_visual ##### -->
+<!-- ##### FUNCTION cairo_xlib_surface_create_for_bitmap ##### -->
 <para>
 
 </para>
 
 @dpy: 
-@drawable: 
-@visual: 
+@bitmap: 
+@width: 
+@height: 
 @Returns: 
 
 
diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index 06a5fba6d..992ace500 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -74,16 +74,6 @@ Drawing contexts.
 @cr: 
 
 
-<!-- ##### MACRO cairo_copy ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@dest: 
-@src: 
-
-
 <!-- ##### ENUM cairo_format_t ##### -->
 <para>
 
@@ -153,8 +143,6 @@ Drawing contexts.
 
 @cr: 
 @source: 
-<!-- # Unused Parameters # -->
-@pattern: 
 
 
 <!-- ##### FUNCTION cairo_set_source_surface ##### -->
@@ -168,16 +156,6 @@ Drawing contexts.
 @y: 
 
 
-<!-- ##### MACRO cairo_set_alpha ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-@alpha: 
-
-
 <!-- ##### FUNCTION cairo_set_tolerance ##### -->
 <para>
 
@@ -316,15 +294,6 @@ Drawing contexts.
 @matrix: 
 
 
-<!-- ##### MACRO cairo_default_matrix ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-
-
 <!-- ##### FUNCTION cairo_identity_matrix ##### -->
 <para>
 
@@ -718,7 +687,6 @@ Drawing contexts.
 
 @cr: 
 @matrix: 
-@Returns: 
 
 
 <!-- ##### FUNCTION cairo_show_text ##### -->
@@ -756,10 +724,6 @@ Drawing contexts.
 
 @cr: 
 @extents: 
-<!-- # Unused Parameters # -->
-@font: 
-@Returns: 
-@font_matrix: 
 
 
 <!-- ##### FUNCTION cairo_set_font_face ##### -->
@@ -811,18 +775,6 @@ Drawing contexts.
 @num_glyphs: 
 
 
-<!-- ##### MACRO cairo_show_surface ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-@surface: 
-@width: 
-@height: 
-
-
 <!-- ##### FUNCTION cairo_get_operator ##### -->
 <para>
 
@@ -925,33 +877,6 @@ Drawing contexts.
 @Returns: 
 
 
-<!-- ##### MACRO cairo_get_path ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-@move_to: 
-@line_to: 
-@curve_to: 
-@close_path: 
-@closure: 
-
-
-<!-- ##### MACRO cairo_get_path_flat ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-@move_to: 
-@line_to: 
-@close_path: 
-@closure: 
-
-
 <!-- ##### FUNCTION cairo_copy_path ##### -->
 <para>
 
@@ -979,11 +904,22 @@ Drawing contexts.
 @path: 
 
 
+<!-- ##### ENUM cairo_path_data_type_t ##### -->
+<para>
+
+</para>
+
+@CAIRO_PATH_MOVE_TO: 
+@CAIRO_PATH_LINE_TO: 
+@CAIRO_PATH_CURVE_TO: 
+@CAIRO_PATH_CLOSE_PATH: 
+
 <!-- ##### STRUCT cairo_path_t ##### -->
 <para>
 
 </para>
 
+@status: 
 @data: 
 @num_data: 
 
@@ -1014,7 +950,7 @@ Drawing contexts.
 @CAIRO_STATUS_WRITE_ERROR: 
 @CAIRO_STATUS_SURFACE_FINISHED: 
 @CAIRO_STATUS_SURFACE_TYPE_MISMATCH: 
-@CAIRO_STATUS_BAD_NESTING: 
+@CAIRO_STATUS_PATTERN_TYPE_MISMATCH: 
 
 <!-- ##### FUNCTION cairo_status ##### -->
 <para>
@@ -1025,12 +961,19 @@ Drawing contexts.
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_status_string ##### -->
+<!-- ##### MACRO cairo_status_string ##### -->
 <para>
 
 </para>
 
-@cr: 
+
+
+<!-- ##### FUNCTION cairo_status_to_string ##### -->
+<para>
+
+</para>
+
+@status: 
 @Returns: 
 
 
@@ -1070,15 +1013,6 @@ Drawing contexts.
 @Returns: 
 
 
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../cairo-docs.xml" "book" "refsect2" "")
-End:
--->
-
-
 <!-- ##### FUNCTION cairo_image_surface_get_width ##### -->
 <para>