Put win32 mutex locking on the 1.2.0 roadmap.

Portability improvements for win32 thanks to Hans Breuer <hans@breuer.org>:
Defined sized-integer types when under the influence of _MSC_VER and without stdint.h.
Use #error which is more portable than #warning, (and more indicative of where we want to be before the next release).

26 files changed, 3 insertions, 1879 deletions

diff --git a/doc/public/tmpl/cairo-font-options.sgml b/doc/public/tmpl/cairo-font-options.sgml
index dcb04ec7e..e87b5506c 100644
--- a/doc/public/tmpl/cairo-font-options.sgml
+++ b/doc/public/tmpl/cairo-font-options.sgml
@@ -23,86 +23,6 @@ How a font should be rendered
 </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: 
-
-
-<!-- ##### 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>
 
@@ -114,26 +34,6 @@ How a font should be rendered
 @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>
 
@@ -145,24 +45,6 @@ How a font should be rendered
 @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>
 
@@ -172,21 +54,3 @@ How a font should be rendered
 @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-font.sgml b/doc/public/tmpl/cairo-font.sgml
index 4e50f6918..b65281e21 100644
--- a/doc/public/tmpl/cairo-font.sgml
+++ b/doc/public/tmpl/cairo-font.sgml
@@ -23,51 +23,3 @@ Base class for fonts
 </para>
 
 
-<!-- ##### FUNCTION cairo_font_face_reference ##### -->
-<para>
-
-</para>
-
-@font_face: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_font_face_destroy ##### -->
-<para>
-
-</para>
-
-@font_face: 
-
-
-<!-- ##### FUNCTION cairo_font_face_status ##### -->
-<para>
-
-</para>
-
-@font_face: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_font_face_get_user_data ##### -->
-<para>
-
-</para>
-
-@font_face: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_font_face_set_user_data ##### -->
-<para>
-
-</para>
-
-@font_face: 
-@key: 
-@user_data: 
-@destroy: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-ft.sgml b/doc/public/tmpl/cairo-ft.sgml
index db928406a..275f7af2f 100644
--- a/doc/public/tmpl/cairo-ft.sgml
+++ b/doc/public/tmpl/cairo-ft.sgml
@@ -17,48 +17,3 @@ Font support for FreeType
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_ft_font_face_create_for_ft_face ##### -->
-<para>
-
-</para>
-
-@face: 
-@load_flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_ft_font_face_create_for_pattern ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_ft_font_options_substitute ##### -->
-<para>
-
-</para>
-
-@options: 
-@pattern: 
-
-
-<!-- ##### FUNCTION cairo_ft_scaled_font_lock_face ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_ft_scaled_font_unlock_face ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-
-
diff --git a/doc/public/tmpl/cairo-glitz.sgml b/doc/public/tmpl/cairo-glitz.sgml
index 4d53e11e1..437c71e08 100644
--- a/doc/public/tmpl/cairo-glitz.sgml
+++ b/doc/public/tmpl/cairo-glitz.sgml
@@ -17,12 +17,3 @@ OpenGL accelerated rendering using the Glitz library
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_glitz_surface_create ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-image.sgml b/doc/public/tmpl/cairo-image.sgml
index 791418837..8e8dc86e1 100644
--- a/doc/public/tmpl/cairo-image.sgml
+++ b/doc/public/tmpl/cairo-image.sgml
@@ -30,45 +30,3 @@ Rendering to memory buffers
 @CAIRO_FORMAT_A8: 
 @CAIRO_FORMAT_A1: 
 
-<!-- ##### FUNCTION cairo_image_surface_create ##### -->
-<para>
-
-</para>
-
-@format: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_image_surface_create_for_data ##### -->
-<para>
-
-</para>
-
-@data: 
-@format: 
-@width: 
-@height: 
-@stride: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_image_surface_get_width ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_image_surface_get_height ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-matrix.sgml b/doc/public/tmpl/cairo-matrix.sgml
index 26f7fe3b1..3effbd239 100644
--- a/doc/public/tmpl/cairo-matrix.sgml
+++ b/doc/public/tmpl/cairo-matrix.sgml
@@ -44,122 +44,3 @@ Generic matrix operations
 @x0: 
 @y0: 
 
-<!-- ##### FUNCTION cairo_matrix_init ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@xx: 
-@yx: 
-@xy: 
-@yy: 
-@x0: 
-@y0: 
-
-
-<!-- ##### FUNCTION cairo_matrix_init_identity ##### -->
-<para>
-
-</para>
-
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_matrix_init_translate ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@tx: 
-@ty: 
-
-
-<!-- ##### FUNCTION cairo_matrix_init_scale ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@sx: 
-@sy: 
-
-
-<!-- ##### FUNCTION cairo_matrix_init_rotate ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@radians: 
-
-
-<!-- ##### FUNCTION cairo_matrix_translate ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@tx: 
-@ty: 
-
-
-<!-- ##### FUNCTION cairo_matrix_scale ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@sx: 
-@sy: 
-
-
-<!-- ##### FUNCTION cairo_matrix_rotate ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@radians: 
-
-
-<!-- ##### FUNCTION cairo_matrix_invert ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_matrix_multiply ##### -->
-<para>
-
-</para>
-
-@result: 
-@a: 
-@b: 
-
-
-<!-- ##### FUNCTION cairo_matrix_transform_distance ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION cairo_matrix_transform_point ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@x: 
-@y: 
-
-
diff --git a/doc/public/tmpl/cairo-paths.sgml b/doc/public/tmpl/cairo-paths.sgml
index 357dca3e5..01bf12d67 100644
--- a/doc/public/tmpl/cairo-paths.sgml
+++ b/doc/public/tmpl/cairo-paths.sgml
@@ -42,189 +42,3 @@ Creating paths and manipulating path data
 @CAIRO_PATH_CURVE_TO: 
 @CAIRO_PATH_CLOSE_PATH: 
 
-<!-- ##### FUNCTION cairo_copy_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_copy_path_flat ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_path_destroy ##### -->
-<para>
-
-</para>
-
-@path: 
-
-
-<!-- ##### FUNCTION cairo_append_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-@path: 
-
-
-<!-- ##### FUNCTION cairo_get_current_point ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_new_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_close_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_arc ##### -->
-<para>
-
-</para>
-
-@cr: 
-@xc: 
-@yc: 
-@radius: 
-@angle1: 
-@angle2: 
-
-
-<!-- ##### FUNCTION cairo_arc_negative ##### -->
-<para>
-
-</para>
-
-@cr: 
-@xc: 
-@yc: 
-@radius: 
-@angle1: 
-@angle2: 
-
-
-<!-- ##### FUNCTION cairo_curve_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x1: 
-@y1: 
-@x2: 
-@y2: 
-@x3: 
-@y3: 
-
-
-<!-- ##### FUNCTION cairo_line_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_move_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_rectangle ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION cairo_glyph_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-@glyphs: 
-@num_glyphs: 
-
-
-<!-- ##### FUNCTION cairo_text_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-@utf8: 
-
-
-<!-- ##### FUNCTION cairo_rel_curve_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx1: 
-@dy1: 
-@dx2: 
-@dy2: 
-@dx3: 
-@dy3: 
-
-
-<!-- ##### FUNCTION cairo_rel_line_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION cairo_rel_move_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx: 
-@dy: 
-
-
diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml
index cd7277cbf..137874d7a 100644
--- a/doc/public/tmpl/cairo-pattern.sgml
+++ b/doc/public/tmpl/cairo-pattern.sgml
@@ -23,115 +23,6 @@ Gradients and filtered sources
 </para>
 
 
-<!-- ##### FUNCTION cairo_pattern_add_color_stop_rgb ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@offset: 
-@red: 
-@green: 
-@blue: 
-
-
-<!-- ##### FUNCTION cairo_pattern_add_color_stop_rgba ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@offset: 
-@red: 
-@green: 
-@blue: 
-@alpha: 
-
-
-<!-- ##### 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>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_create_linear ##### -->
-<para>
-
-</para>
-
-@x0: 
-@y0: 
-@x1: 
-@y1: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_create_radial ##### -->
-<para>
-
-</para>
-
-@cx0: 
-@cy0: 
-@radius0: 
-@cx1: 
-@cy1: 
-@radius1: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_destroy ##### -->
-<para>
-
-</para>
-
-@pattern: 
-
-
-<!-- ##### FUNCTION cairo_pattern_reference ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_status ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@Returns: 
-
-
 <!-- ##### ENUM cairo_extend_t ##### -->
 <para>
 
@@ -141,24 +32,6 @@ Gradients and filtered sources
 @CAIRO_EXTEND_REPEAT: 
 @CAIRO_EXTEND_REFLECT: 
 
-<!-- ##### FUNCTION cairo_pattern_set_extend ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@extend: 
-
-
-<!-- ##### FUNCTION cairo_pattern_get_extend ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@Returns: 
-
-
 <!-- ##### ENUM cairo_filter_t ##### -->
 <para>
 
@@ -171,41 +44,3 @@ Gradients and filtered sources
 @CAIRO_FILTER_BILINEAR: 
 @CAIRO_FILTER_GAUSSIAN: 
 
-<!-- ##### FUNCTION cairo_pattern_set_filter ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@filter: 
-
-
-<!-- ##### FUNCTION cairo_pattern_get_filter ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_set_matrix ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_pattern_get_matrix ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@matrix: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml
index fd637a4f5..4f7dbd71d 100644
--- a/doc/public/tmpl/cairo-pdf.sgml
+++ b/doc/public/tmpl/cairo-pdf.sgml
@@ -17,36 +17,3 @@ Rendering PDF documents
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_pdf_surface_create ##### -->
-<para>
-
-</para>
-
-@filename: 
-@width_in_points: 
-@height_in_points: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pdf_surface_create_for_stream ##### -->
-<para>
-
-</para>
-
-@write_func: 
-@closure: 
-@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-png.sgml b/doc/public/tmpl/cairo-png.sgml
index d2e93f7d0..cba1516e7 100644
--- a/doc/public/tmpl/cairo-png.sgml
+++ b/doc/public/tmpl/cairo-png.sgml
@@ -17,15 +17,6 @@ Reading and writing PNG images
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_image_surface_create_from_png ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
 <!-- ##### USER_FUNCTION cairo_read_func_t ##### -->
 <para>
 
@@ -37,26 +28,6 @@ Reading and writing PNG images
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_image_surface_create_from_png_stream ##### -->
-<para>
-
-</para>
-
-@read_func: 
-@closure: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_write_to_png ##### -->
-<para>
-
-</para>
-
-@surface: 
-@filename: 
-@Returns: 
-
-
 <!-- ##### USER_FUNCTION cairo_write_func_t ##### -->
 <para>
 
@@ -68,14 +39,3 @@ Reading and writing PNG images
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_surface_write_to_png_stream ##### -->
-<para>
-
-</para>
-
-@surface: 
-@write_func: 
-@closure: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-ps.sgml b/doc/public/tmpl/cairo-ps.sgml
index 659455a82..a3d5765a6 100644
--- a/doc/public/tmpl/cairo-ps.sgml
+++ b/doc/public/tmpl/cairo-ps.sgml
@@ -17,36 +17,3 @@ Rendering PostScript documents
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_ps_surface_create ##### -->
-<para>
-
-</para>
-
-@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-quartz.sgml b/doc/public/tmpl/cairo-quartz.sgml
index e6c5a6968..02a69d919 100644
--- a/doc/public/tmpl/cairo-quartz.sgml
+++ b/doc/public/tmpl/cairo-quartz.sgml
@@ -17,14 +17,3 @@ Rendering to Quartz surfaces
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_quartz_surface_create ##### -->
-<para>
-
-</para>
-
-@context: 
-@width: 
-@height: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-scaled-font.sgml b/doc/public/tmpl/cairo-scaled-font.sgml
index c94a2bc5e..06564548f 100644
--- a/doc/public/tmpl/cairo-scaled-font.sgml
+++ b/doc/public/tmpl/cairo-scaled-font.sgml
@@ -23,44 +23,6 @@ Caching metrics for a particular font size
 </para>
 
 
-<!-- ##### FUNCTION cairo_scaled_font_create ##### -->
-<para>
-
-</para>
-
-@font_face: 
-@font_matrix: 
-@ctm: 
-@options: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_scaled_font_reference ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_scaled_font_destroy ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-
-
-<!-- ##### FUNCTION cairo_scaled_font_status ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-@Returns: 
-
-
 <!-- ##### STRUCT cairo_font_extents_t ##### -->
 <para>
 
@@ -72,17 +34,6 @@ Caching metrics for a particular font size
 @max_x_advance: 
 @max_y_advance: 
 
-<!-- ##### FUNCTION cairo_scaled_font_extents ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-@extents: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
 <!-- ##### STRUCT cairo_text_extents_t ##### -->
 <para>
 
@@ -95,14 +46,3 @@ Caching metrics for a particular font size
 @x_advance: 
 @y_advance: 
 
-<!-- ##### FUNCTION cairo_scaled_font_glyph_extents ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-@glyphs: 
-@num_glyphs: 
-@extents: 
-
-
diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml
index 4112fc054..de5f35fea 100644
--- a/doc/public/tmpl/cairo-status.sgml
+++ b/doc/public/tmpl/cairo-status.sgml
@@ -43,15 +43,6 @@ Decoding cairo's status
 @CAIRO_STATUS_FILE_NOT_FOUND: 
 @CAIRO_STATUS_INVALID_DASH: 
 
-<!-- ##### FUNCTION cairo_status_to_string ##### -->
-<para>
-
-</para>
-
-@status: 
-@Returns: 
-
-
 <!-- ##### FUNCTION cairo_debug_reset_static_data ##### -->
 <para>
 
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index 2b9bd519a..69d63d276 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -32,122 +32,3 @@ Base class for surfaces
 @CAIRO_CONTENT_ALPHA: 
 @CAIRO_CONTENT_COLOR_ALPHA: 
 
-<!-- ##### FUNCTION cairo_surface_create_similar ##### -->
-<para>
-
-</para>
-
-@other: 
-@content: 
-@width: 
-@height: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@format: 
-
-
-<!-- ##### FUNCTION cairo_surface_destroy ##### -->
-<para>
-
-</para>
-
-@surface: 
-
-
-<!-- ##### FUNCTION cairo_surface_finish ##### -->
-<para>
-
-</para>
-
-@surface: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_flush ##### -->
-<para>
-
-</para>
-
-@surface: 
-
-
-<!-- ##### FUNCTION cairo_surface_get_font_options ##### -->
-<para>
-
-</para>
-
-@surface: 
-@options: 
-
-
-<!-- ##### FUNCTION cairo_surface_set_user_data ##### -->
-<para>
-
-</para>
-
-@surface: 
-@key: 
-@user_data: 
-@destroy: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_get_user_data ##### -->
-<para>
-
-</para>
-
-@surface: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_mark_dirty ##### -->
-<para>
-
-</para>
-
-@surface: 
-
-
-<!-- ##### FUNCTION cairo_surface_mark_dirty_rectangle ##### -->
-<para>
-
-</para>
-
-@surface: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION cairo_surface_reference ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_set_device_offset ##### -->
-<para>
-
-</para>
-
-@surface: 
-@x_offset: 
-@y_offset: 
-
-
-<!-- ##### FUNCTION cairo_surface_status ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-text.sgml b/doc/public/tmpl/cairo-text.sgml
index 2f4d213a8..56678b167 100644
--- a/doc/public/tmpl/cairo-text.sgml
+++ b/doc/public/tmpl/cairo-text.sgml
@@ -43,126 +43,3 @@ Rendering text and sets of glyphs
 @CAIRO_FONT_WEIGHT_NORMAL: 
 @CAIRO_FONT_WEIGHT_BOLD: 
 
-<!-- ##### FUNCTION cairo_select_font_face ##### -->
-<para>
-
-</para>
-
-@cr: 
-@family: 
-@slant: 
-@weight: 
-
-
-<!-- ##### FUNCTION cairo_set_font_size ##### -->
-<para>
-
-</para>
-
-@cr: 
-@size: 
-
-
-<!-- ##### FUNCTION cairo_set_font_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_get_font_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_set_font_options ##### -->
-<para>
-
-</para>
-
-@cr: 
-@options: 
-
-
-<!-- ##### FUNCTION cairo_get_font_options ##### -->
-<para>
-
-</para>
-
-@cr: 
-@options: 
-
-
-<!-- ##### FUNCTION cairo_show_text ##### -->
-<para>
-
-</para>
-
-@cr: 
-@utf8: 
-
-
-<!-- ##### FUNCTION cairo_show_glyphs ##### -->
-<para>
-
-</para>
-
-@cr: 
-@glyphs: 
-@num_glyphs: 
-
-
-<!-- ##### FUNCTION cairo_get_font_face ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_font_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@extents: 
-
-
-<!-- ##### FUNCTION cairo_set_font_face ##### -->
-<para>
-
-</para>
-
-@cr: 
-@font_face: 
-
-
-<!-- ##### FUNCTION cairo_text_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@utf8: 
-@extents: 
-
-
-<!-- ##### FUNCTION cairo_glyph_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@glyphs: 
-@num_glyphs: 
-@extents: 
-
-
diff --git a/doc/public/tmpl/cairo-transforms.sgml b/doc/public/tmpl/cairo-transforms.sgml
index 55d1c5cec..65199c8b4 100644
--- a/doc/public/tmpl/cairo-transforms.sgml
+++ b/doc/public/tmpl/cairo-transforms.sgml
@@ -17,109 +17,3 @@ Manipulating the current transformation matrix
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_translate ##### -->
-<para>
-
-</para>
-
-@cr: 
-@tx: 
-@ty: 
-
-
-<!-- ##### FUNCTION cairo_scale ##### -->
-<para>
-
-</para>
-
-@cr: 
-@sx: 
-@sy: 
-
-
-<!-- ##### FUNCTION cairo_rotate ##### -->
-<para>
-
-</para>
-
-@cr: 
-@angle: 
-
-
-<!-- ##### FUNCTION cairo_transform ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_set_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_get_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_identity_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_user_to_device ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_user_to_device_distance ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION cairo_device_to_user ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_device_to_user_distance ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx: 
-@dy: 
-
-
diff --git a/doc/public/tmpl/cairo-types.sgml b/doc/public/tmpl/cairo-types.sgml
index c0c14faf6..9e6f6b599 100644
--- a/doc/public/tmpl/cairo-types.sgml
+++ b/doc/public/tmpl/cairo-types.sgml
@@ -17,11 +17,13 @@ Generic data types used in the cairo API
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_bool_t ##### -->
+<!-- ##### FUNCTION cairo_bool_t ##### -->
 <para>
 
 </para>
 
+@Returns: 
+
 
 <!-- ##### STRUCT cairo_user_data_key_t ##### -->
 <para>
diff --git a/doc/public/tmpl/cairo-version.sgml b/doc/public/tmpl/cairo-version.sgml
index 812eb3013..42eb58eb7 100644
--- a/doc/public/tmpl/cairo-version.sgml
+++ b/doc/public/tmpl/cairo-version.sgml
@@ -134,19 +134,3 @@ if (cairo_version() >= %CAIRO_VERSION_ENCODE(1, 0, 0))
 @micro: 
 
 
-<!-- ##### FUNCTION cairo_version ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_version_string ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-win32-fonts.sgml b/doc/public/tmpl/cairo-win32-fonts.sgml
index 2bc67f4a8..3652ccbdc 100644
--- a/doc/public/tmpl/cairo-win32-fonts.sgml
+++ b/doc/public/tmpl/cairo-win32-fonts.sgml
@@ -17,39 +17,3 @@ Font support for Microsoft Windows
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### 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-win32.sgml b/doc/public/tmpl/cairo-win32.sgml
index 8b52fc8c8..b486ba833 100644
--- a/doc/public/tmpl/cairo-win32.sgml
+++ b/doc/public/tmpl/cairo-win32.sgml
@@ -17,12 +17,3 @@ Microsoft Windows surface support
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_win32_surface_create ##### -->
-<para>
-
-</para>
-
-@hdc: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-xcb-xrender.sgml b/doc/public/tmpl/cairo-xcb-xrender.sgml
index a8cd029da..fc243236d 100644
--- a/doc/public/tmpl/cairo-xcb-xrender.sgml
+++ b/doc/public/tmpl/cairo-xcb-xrender.sgml
@@ -17,16 +17,3 @@ X Window System rendering using the XCB library
 <!-- ##### 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 ad3525366..fc243236d 100644
--- a/doc/public/tmpl/cairo-xcb.sgml
+++ b/doc/public/tmpl/cairo-xcb.sgml
@@ -17,38 +17,3 @@ X Window System rendering using the XCB library
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_xcb_surface_create ##### -->
-<para>
-
-</para>
-
-@c: 
-@drawable: 
-@visual: 
-@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
index 398900e88..c99d78407 100644
--- a/doc/public/tmpl/cairo-xlib-xrender.sgml
+++ b/doc/public/tmpl/cairo-xlib-xrender.sgml
@@ -17,17 +17,3 @@ XLib/Xrender Backend
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_xlib_surface_create_with_xrender_format ##### -->
-<para>
-
-</para>
-
-@dpy: 
-@drawable: 
-@screen: 
-@format: 
-@width: 
-@height: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-xlib.sgml b/doc/public/tmpl/cairo-xlib.sgml
index bd3c8b65a..f931a50f8 100644
--- a/doc/public/tmpl/cairo-xlib.sgml
+++ b/doc/public/tmpl/cairo-xlib.sgml
@@ -17,50 +17,3 @@ X Window System rendering using XLib
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_xlib_surface_create ##### -->
-<para>
-
-</para>
-
-@dpy: 
-@drawable: 
-@visual: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_xlib_surface_create_for_bitmap ##### -->
-<para>
-
-</para>
-
-@dpy: 
-@bitmap: 
-@screen: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_xlib_surface_set_size ##### -->
-<para>
-
-</para>
-
-@surface: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION cairo_xlib_surface_set_drawable ##### -->
-<para>
-
-</para>
-
-@surface: 
-@drawable: 
-@width: 
-@height: 
-
-
diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index eafe20bc7..04480e715 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -33,118 +33,6 @@ The cairo drawing context
 </para>
 
 
-<!-- ##### FUNCTION cairo_create ##### -->
-<para>
-
-</para>
-
-@target: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_reference ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_destroy ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_save ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_restore ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_status ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_target ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_set_source_rgb ##### -->
-<para>
-
-</para>
-
-@cr: 
-@red: 
-@green: 
-@blue: 
-
-
-<!-- ##### FUNCTION cairo_set_source_rgba ##### -->
-<para>
-
-</para>
-
-@cr: 
-@red: 
-@green: 
-@blue: 
-@alpha: 
-
-
-<!-- ##### FUNCTION cairo_set_source ##### -->
-<para>
-
-</para>
-
-@cr: 
-@source: 
-
-
-<!-- ##### FUNCTION cairo_set_source_surface ##### -->
-<para>
-
-</para>
-
-@cr: 
-@surface: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_get_source ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
 <!-- ##### ENUM cairo_antialias_t ##### -->
 <para>
 
@@ -155,37 +43,6 @@ The cairo drawing context
 @CAIRO_ANTIALIAS_GRAY: 
 @CAIRO_ANTIALIAS_SUBPIXEL: 
 
-<!-- ##### FUNCTION cairo_set_antialias ##### -->
-<para>
-
-</para>
-
-@cr: 
-@antialias: 
-
-
-<!-- ##### FUNCTION cairo_get_antialias ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_set_dash ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dashes: 
-@num_dashes: 
-@offset: 
-<!-- # Unused Parameters # -->
-@ndash: 
-
-
 <!-- ##### ENUM cairo_fill_rule_t ##### -->
 <para>
 
@@ -194,24 +51,6 @@ The cairo drawing context
 @CAIRO_FILL_RULE_WINDING: 
 @CAIRO_FILL_RULE_EVEN_ODD: 
 
-<!-- ##### FUNCTION cairo_set_fill_rule ##### -->
-<para>
-
-</para>
-
-@cr: 
-@fill_rule: 
-
-
-<!-- ##### FUNCTION cairo_get_fill_rule ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
 <!-- ##### ENUM cairo_line_cap_t ##### -->
 <para>
 
@@ -221,24 +60,6 @@ The cairo drawing context
 @CAIRO_LINE_CAP_ROUND: 
 @CAIRO_LINE_CAP_SQUARE: 
 
-<!-- ##### FUNCTION cairo_set_line_cap ##### -->
-<para>
-
-</para>
-
-@cr: 
-@line_cap: 
-
-
-<!-- ##### FUNCTION cairo_get_line_cap ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
 <!-- ##### ENUM cairo_line_join_t ##### -->
 <para>
 
@@ -248,60 +69,6 @@ The cairo drawing context
 @CAIRO_LINE_JOIN_ROUND: 
 @CAIRO_LINE_JOIN_BEVEL: 
 
-<!-- ##### FUNCTION cairo_set_line_join ##### -->
-<para>
-
-</para>
-
-@cr: 
-@line_join: 
-
-
-<!-- ##### FUNCTION cairo_get_line_join ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_set_line_width ##### -->
-<para>
-
-</para>
-
-@cr: 
-@width: 
-
-
-<!-- ##### FUNCTION cairo_get_line_width ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_set_miter_limit ##### -->
-<para>
-
-</para>
-
-@cr: 
-@limit: 
-
-
-<!-- ##### FUNCTION cairo_get_miter_limit ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
 <!-- ##### ENUM cairo_operator_t ##### -->
 <para>
 
@@ -322,194 +89,3 @@ The cairo drawing context
 @CAIRO_OPERATOR_ADD: 
 @CAIRO_OPERATOR_SATURATE: 
 
-<!-- ##### FUNCTION cairo_set_operator ##### -->
-<para>
-
-</para>
-
-@cr: 
-@op: 
-
-
-<!-- ##### FUNCTION cairo_get_operator ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_set_tolerance ##### -->
-<para>
-
-</para>
-
-@cr: 
-@tolerance: 
-
-
-<!-- ##### FUNCTION cairo_get_tolerance ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_clip ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_clip_preserve ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_reset_clip ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_fill ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_fill_preserve ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_fill_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x1: 
-@y1: 
-@x2: 
-@y2: 
-
-
-<!-- ##### FUNCTION cairo_in_fill ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_mask ##### -->
-<para>
-
-</para>
-
-@cr: 
-@pattern: 
-
-
-<!-- ##### FUNCTION cairo_mask_surface ##### -->
-<para>
-
-</para>
-
-@cr: 
-@surface: 
-@surface_x: 
-@surface_y: 
-
-
-<!-- ##### FUNCTION cairo_paint ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_paint_with_alpha ##### -->
-<para>
-
-</para>
-
-@cr: 
-@alpha: 
-
-
-<!-- ##### FUNCTION cairo_stroke ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_stroke_preserve ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_stroke_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x1: 
-@y1: 
-@x2: 
-@y2: 
-
-
-<!-- ##### FUNCTION cairo_in_stroke ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_copy_page ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_show_page ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-