diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-02 00:37:19 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-02 00:56:39 -0700 |
| commit | f59f44c140e5f60d336423e0585d2bb8a6c0ea01 (patch) | |
| tree | b0e1369a4aedfb6ee288fd29264177e881021850 /doc/public | |
| parent | 2da78fd4666faa27d037ae3625ca83353a6e7629 (diff) | |
| parent | 4232719af968ed05636fe34f2ffe2520dc02d737 (diff) | |
Merge commit 'origin/master' into gl
Felt like pulling the latest stuff, since I branched back in February.
Conflicts:
build/configure.ac.features
src/cairo.h
util/cairo-script/csi-replay.c
Diffstat (limited to 'doc/public')
| -rw-r--r-- | doc/public/cairo-sections.txt | 1 | ||||
| -rw-r--r-- | doc/public/tmpl/cairo-ft.sgml | 9 | ||||
| -rw-r--r-- | doc/public/tmpl/cairo-status.sgml | 3 | ||||
| -rw-r--r-- | doc/public/tmpl/cairo-surface.sgml | 1 |
4 files changed, 13 insertions, 1 deletions
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt index bb64cd68..ff89db71 100644 --- a/doc/public/cairo-sections.txt +++ b/doc/public/cairo-sections.txt @@ -2,6 +2,7 @@ <FILE>cairo-ft</FILE> <TITLE>ft-font</TITLE> CAIRO_HAS_FT_FONT +CAIRO_HAS_FC_FONT cairo_ft_font_face_create_for_ft_face cairo_ft_font_face_create_for_pattern cairo_ft_font_options_substitute diff --git a/doc/public/tmpl/cairo-ft.sgml b/doc/public/tmpl/cairo-ft.sgml index 68a3fd43..307d632f 100644 --- a/doc/public/tmpl/cairo-ft.sgml +++ b/doc/public/tmpl/cairo-ft.sgml @@ -28,6 +28,15 @@ This macro can be used to conditionally compile backend-specific code. +<!-- ##### MACRO CAIRO_HAS_FC_FONT ##### --> +<para> +Defined if the Fontconfig-specific functions of the FreeType font backend +are available. +This macro can be used to conditionally compile backend-specific code. +</para> + + + <!-- ##### FUNCTION cairo_ft_font_face_create_for_ft_face ##### --> <para> diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml index fcc17a9c..aed8aa64 100644 --- a/doc/public/tmpl/cairo-status.sgml +++ b/doc/public/tmpl/cairo-status.sgml @@ -70,6 +70,9 @@ code is required before or after each individual cairo function call. @CAIRO_STATUS_INVALID_CLUSTERS: @CAIRO_STATUS_INVALID_SLANT: @CAIRO_STATUS_INVALID_WEIGHT: +@CAIRO_STATUS_INVALID_SIZE: +@CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED: +@CAIRO_STATUS_LAST_STATUS: <!-- ##### FUNCTION cairo_status_to_string ##### --> <para> diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml index f32dd49e..f7df8296 100644 --- a/doc/public/tmpl/cairo-surface.sgml +++ b/doc/public/tmpl/cairo-surface.sgml @@ -214,7 +214,6 @@ The Portable Network Graphics image file format (ISO/IEC 15948). Since 1.10 @CAIRO_SURFACE_TYPE_OS2: @CAIRO_SURFACE_TYPE_WIN32_PRINTING: @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: -@CAIRO_SURFACE_TYPE_SDL: @CAIRO_SURFACE_TYPE_SCRIPT: <!-- ##### FUNCTION cairo_surface_get_type ##### --> |