[cairo-commit] 7 commits - configure.in doc/public src/cairo-xlib-surface.c src/check-headers.sh src/Makefile.am
Behdad Esfahbod
behdad at kemper.freedesktop.org
Mon Jan 28 20:30:45 PST 2008
configure.in | 39 +++++++++++
doc/public/Makefile.am | 2
doc/public/cairo-docs.xml | 2
doc/public/cairo-sections.txt | 11 ++-
doc/public/tmpl/cairo-font-face.sgml | 112 ++++++++++++++++++++++++++++++++
doc/public/tmpl/cairo-font.sgml | 112 --------------------------------
doc/public/tmpl/cairo-ft.sgml | 8 ++
doc/public/tmpl/cairo-pdf.sgml | 8 ++
doc/public/tmpl/cairo-png.sgml | 9 ++
doc/public/tmpl/cairo-ps.sgml | 8 ++
doc/public/tmpl/cairo-svg.sgml | 8 ++
doc/public/tmpl/cairo-version.sgml | 4 -
doc/public/tmpl/cairo-win32-fonts.sgml | 8 ++
doc/public/tmpl/cairo-win32.sgml | 8 ++
doc/public/tmpl/cairo-xlib-xrender.sgml | 8 ++
doc/public/tmpl/cairo-xlib.sgml | 8 ++
src/Makefile.am | 6 -
src/cairo-xlib-surface.c | 2
src/check-headers.sh | 2
19 files changed, 244 insertions(+), 121 deletions(-)
New commits:
commit 468caac068d3d25507d901f069e3e55731a27ae9
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Jan 28 23:30:09 2008 -0500
[configure.in] Minor change to cairo-features.h comments to make tests pass
diff --git a/configure.in b/configure.in
index 9671253..8077f8e 100644
--- a/configure.in
+++ b/configure.in
@@ -985,7 +985,7 @@ _EOF
done
echo '' >> $outfile
for FEATURE in $CAIRO_NO_FEATURES; do
- echo "/* #undef CAIRO_HAS_$FEATURE */" >> $outfile
+ echo "/*#undef CAIRO_HAS_$FEATURE */" >> $outfile
done
echo '' >> $outfile
commit b4c7a0dc6e996e47390ae544f82024afbb7859ed
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Jan 28 23:27:10 2008 -0500
[doc] Document CAIRO_HAS_* macros. We now finally have real 100% coverage.
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index 9087147..b4dd16c 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -70,5 +70,7 @@ include $(top_srcdir)/gtk-doc.make
# Version information for marking the documentation
EXTRA_DIST += version.xml.in
+check: doc
+
TESTS_ENVIRONMENT = srcdir="$(srcdir)" MAKE="$(MAKE)"
TESTS = check-doc-coverage.sh
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index a36156a..f7c838d 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_HAS_FT_FONT
cairo_ft_font_face_create_for_ft_face
cairo_ft_font_face_create_for_pattern
cairo_ft_font_options_substitute
@@ -11,6 +12,7 @@ cairo_ft_scaled_font_unlock_face
<SECTION>
<FILE>cairo-win32-fonts</FILE>
<TITLE>Win32 Fonts</TITLE>
+CAIRO_HAS_WIN32_FONT
cairo_win32_font_face_create_for_logfontw
cairo_win32_font_face_create_for_hfont
cairo_win32_font_face_create_for_logfontw_hfont
@@ -38,6 +40,7 @@ cairo_image_surface_get_stride
<SECTION>
<FILE>cairo-pdf</FILE>
<TITLE>PDF Surfaces</TITLE>
+CAIRO_HAS_PDF_SURFACE
cairo_pdf_surface_create
cairo_pdf_surface_create_for_stream
cairo_pdf_surface_set_size
@@ -46,6 +49,7 @@ cairo_pdf_surface_set_size
<SECTION>
<FILE>cairo-png</FILE>
<TITLE>PNG Support</TITLE>
+CAIRO_HAS_PNG_FUNCTIONS
cairo_image_surface_create_from_png
cairo_read_func_t
cairo_image_surface_create_from_png_stream
@@ -57,6 +61,7 @@ cairo_surface_write_to_png_stream
<SECTION>
<FILE>cairo-ps</FILE>
<TITLE>PostScript Surfaces</TITLE>
+CAIRO_HAS_PS_SURFACE
cairo_ps_surface_create
cairo_ps_surface_create_for_stream
cairo_ps_surface_restrict_to_level
@@ -74,6 +79,7 @@ cairo_ps_surface_dsc_comment
<SECTION>
<FILE>cairo-win32</FILE>
<TITLE>Win32 Surfaces</TITLE>
+CAIRO_HAS_WIN32_SURFACE
cairo_win32_surface_create
cairo_win32_surface_create_with_dib
cairo_win32_surface_create_with_ddb
@@ -85,6 +91,7 @@ cairo_win32_surface_get_image
<SECTION>
<FILE>cairo-xlib</FILE>
<TITLE>XLib Surfaces</TITLE>
+CAIRO_HAS_XLIB_SURFACE
cairo_xlib_surface_create
cairo_xlib_surface_create_for_bitmap
cairo_xlib_surface_set_size
@@ -101,6 +108,7 @@ cairo_xlib_surface_get_depth
<SECTION>
<FILE>cairo-xlib-xrender</FILE>
<TITLE>XLib/Xrender Backend</TITLE>
+CAIRO_HAS_XLIB_XRENDER_SURFACE
cairo_xlib_surface_create_with_xrender_format
cairo_xlib_surface_get_xrender_format
</SECTION>
@@ -108,6 +116,7 @@ cairo_xlib_surface_get_xrender_format
<SECTION>
<FILE>cairo-svg</FILE>
<TITLE>SVG Surfaces</TITLE>
+CAIRO_HAS_SVG_SURFACE
cairo_svg_surface_create
cairo_svg_surface_create_for_stream
cairo_svg_surface_restrict_to_version
diff --git a/doc/public/tmpl/cairo-ft.sgml b/doc/public/tmpl/cairo-ft.sgml
index 8414c86..68a3fd4 100644
--- a/doc/public/tmpl/cairo-ft.sgml
+++ b/doc/public/tmpl/cairo-ft.sgml
@@ -20,6 +20,14 @@ systems, but can be used on other platforms too.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_FT_FONT ##### -->
+<para>
+Defined if the FreeType font backend is 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-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml
index 52a2f8c..fabb8d7 100644
--- a/doc/public/tmpl/cairo-pdf.sgml
+++ b/doc/public/tmpl/cairo-pdf.sgml
@@ -20,6 +20,14 @@ PDF files and is a multi-page vector surface backend.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_PDF_SURFACE ##### -->
+<para>
+Defined if the PDF surface backend is available.
+This macro can be used to conditionally compile backend-specific code.
+</para>
+
+
+
<!-- ##### FUNCTION cairo_pdf_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-png.sgml b/doc/public/tmpl/cairo-png.sgml
index ec703ad..ef52dce 100644
--- a/doc/public/tmpl/cairo-png.sgml
+++ b/doc/public/tmpl/cairo-png.sgml
@@ -20,6 +20,15 @@ any surface to a PNG file.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_PNG_FUNCTIONS ##### -->
+<para>
+Defined if the PNG functions are available.
+This macro can be used to conditionally compile code using the cairo
+PNG functions.
+</para>
+
+
+
<!-- ##### FUNCTION cairo_image_surface_create_from_png ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-ps.sgml b/doc/public/tmpl/cairo-ps.sgml
index b3e80ba..b6bc3ff 100644
--- a/doc/public/tmpl/cairo-ps.sgml
+++ b/doc/public/tmpl/cairo-ps.sgml
@@ -20,6 +20,14 @@ PostScript files and is a multi-page vector surface backend.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_PS_SURFACE ##### -->
+<para>
+Defined if the PostScript surface backend is available.
+This macro can be used to conditionally compile backend-specific code.
+</para>
+
+
+
<!-- ##### FUNCTION cairo_ps_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-svg.sgml b/doc/public/tmpl/cairo-svg.sgml
index c11b502..09b413d 100644
--- a/doc/public/tmpl/cairo-svg.sgml
+++ b/doc/public/tmpl/cairo-svg.sgml
@@ -20,6 +20,14 @@ SVG files and is a multi-page vector surface backend.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_SVG_SURFACE ##### -->
+<para>
+Defined if the SVG surface backend is available.
+This macro can be used to conditionally compile backend-specific code.
+</para>
+
+
+
<!-- ##### FUNCTION cairo_svg_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-win32-fonts.sgml b/doc/public/tmpl/cairo-win32-fonts.sgml
index aabec96..fd7ef3d 100644
--- a/doc/public/tmpl/cairo-win32-fonts.sgml
+++ b/doc/public/tmpl/cairo-win32-fonts.sgml
@@ -20,6 +20,14 @@ Microsoft Windows systems.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_WIN32_FONT ##### -->
+<para>
+Defined if the Microsoft Windows font backend is available.
+This macro can be used to conditionally compile backend-specific code.
+</para>
+
+
+
<!-- ##### FUNCTION cairo_win32_font_face_create_for_logfontw ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-win32.sgml b/doc/public/tmpl/cairo-win32.sgml
index ab1de4e..e7901f8 100644
--- a/doc/public/tmpl/cairo-win32.sgml
+++ b/doc/public/tmpl/cairo-win32.sgml
@@ -29,6 +29,14 @@ The surface returned by the other win32 constructors is of surface type
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_WIN32_SURFACE ##### -->
+<para>
+Defined if the Microsoft Windows surface backend is available.
+This macro can be used to conditionally compile backend-specific code.
+</para>
+
+
+
<!-- ##### FUNCTION cairo_win32_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-xlib-xrender.sgml b/doc/public/tmpl/cairo-xlib-xrender.sgml
index 04663ed..a92805d 100644
--- a/doc/public/tmpl/cairo-xlib-xrender.sgml
+++ b/doc/public/tmpl/cairo-xlib-xrender.sgml
@@ -24,6 +24,14 @@ if it is available.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_XLIB_XRENDER_SURFACE ##### -->
+<para>
+Defined if the XLib/XRender surface functions are available.
+This macro can be used to conditionally compile backend-specific code.
+</para>
+
+
+
<!-- ##### FUNCTION cairo_xlib_surface_create_with_xrender_format ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-xlib.sgml b/doc/public/tmpl/cairo-xlib.sgml
index e0927d0..df6977c 100644
--- a/doc/public/tmpl/cairo-xlib.sgml
+++ b/doc/public/tmpl/cairo-xlib.sgml
@@ -24,6 +24,14 @@ if it is available.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO CAIRO_HAS_XLIB_SURFACE ##### -->
+<para>
+Defined if the XLib surface backend is available.
+This macro can be used to conditionally compile backend-specific code.
+</para>
+
+
+
<!-- ##### FUNCTION cairo_xlib_surface_create ##### -->
<para>
commit 47e0ecbea51cae73a85db277972b80eff0c4b9f6
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Jan 28 23:26:35 2008 -0500
[configure.in] Generate a cairo-no-features.h with macros for disabled supported backends
to trick gtk-doc with it.
diff --git a/configure.in b/configure.in
index 66ec569..9671253 100644
--- a/configure.in
+++ b/configure.in
@@ -983,7 +983,7 @@ _EOF
for FEATURE in $CAIRO_FEATURES; do
echo "#define CAIRO_HAS_$FEATURE 1" >> $outfile
done
- echo >> $outfile
+ echo '' >> $outfile
for FEATURE in $CAIRO_NO_FEATURES; do
echo "/* #undef CAIRO_HAS_$FEATURE */" >> $outfile
done
@@ -1004,6 +1004,37 @@ _EOF
CAIRO_VERSION_MINOR=$CAIRO_VERSION_MINOR
CAIRO_VERSION_MICRO=$CAIRO_VERSION_MICRO
])
+AC_CONFIG_COMMANDS([src/cairo-no-features.h],
+[
+ nofeaturesfile=src/cairo-no-features.h
+ outfile=$nofeaturesfile.tmp
+ AC_MSG_NOTICE([creating $nofeaturesfile])
+ cat > $outfile <<_EOF
+/* Generated by configure. Do not edit */
+#ifndef CAIRO_NO_FEATURES_H
+#define CAIRO_NO_FEATURES_H
+
+#include <cairo-features.h>
+
+/* This is a dummy header, to trick gtk-doc only */
+
+_EOF
+ for FEATURE in $CAIRO_NO_FEATURES; do
+ echo "#define CAIRO_HAS_$FEATURE 1" >> $outfile
+ done
+
+ echo '' >> $outfile
+ echo '#endif' >> $outfile
+
+ if cmp -s $outfile $nofeaturesfile; then
+ AC_MSG_NOTICE([$nofeaturesfile is unchanged])
+ rm -f $outfile
+ else
+ mv $outfile $nofeaturesfile
+ fi
+],[
+ CAIRO_NO_FEATURES='$CAIRO_NO_FEATURES'
+])
AC_CONFIG_FILES([
Makefile
boilerplate/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index c1a2361..e908b9b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -289,9 +289,9 @@ $(backend_pkgconfigs): $(top_srcdir)/configure
$(top_builddir)/config.h: $(top_srcdir)/config.h.in
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
-DISTCLEANFILES += cairo-features.h
-cairo-features.h:
- cd $(top_builddir) && ./config.status src/cairo-features.h
+DISTCLEANFILES += cairo-features.h cairo-no-features.h
+cairo-features.h cairo-no-features.h:
+ cd $(top_builddir) && ./config.status src/$@
CLEANFILES = cairo.def
cairo.def: $(cairo_headers) cairo-features.h
diff --git a/src/check-headers.sh b/src/check-headers.sh
index 2ac74fd..4792b2d 100755
--- a/src/check-headers.sh
+++ b/src/check-headers.sh
@@ -7,7 +7,7 @@ status=0
echo Checking public headers for missing cairo_public decorators
-find "$srcdir" -name '*.h' ! -name '*-private.h' ! -name '*-test.h' ! -name 'cairoint.h' |
+find "$srcdir" -name '*.h' ! -name '*-private.h' ! -name '*-test.h' ! -name 'cairoint.h' ! -name 'cairo-no-features.h' |
xargs grep -B 1 '^cairo_.*[ ]\+(' |
awk '
/^--$/ { context=""; public=0; next; }
commit 9d8990b6bdec8e574e37346c363b3a850a246452
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Jan 28 23:23:00 2008 -0500
[doc] Remove excess paranthesis
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 0957faf..1111320 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -2172,7 +2172,7 @@ slim_hidden_def (cairo_xlib_surface_create_with_xrender_format);
*
* Return value: the XRenderPictFormat* associated with @surface,
* or %NULL if the surface is not an xlib surface
- * or if the X Render extension is not available.)
+ * or if the X Render extension is not available.
*
* Since: 1.6
**/
commit 6e495e94886dfa80f11f675a4b7fa3a767671cc0
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Jan 28 23:10:28 2008 -0500
[doc] More syntax fixes
diff --git a/doc/public/tmpl/cairo-version.sgml b/doc/public/tmpl/cairo-version.sgml
index 012b5fa..62de21d 100644
--- a/doc/public/tmpl/cairo-version.sgml
+++ b/doc/public/tmpl/cairo-version.sgml
@@ -77,7 +77,7 @@ rather the many states between snapshots and releases.
Cairo provides the ability to examine the version at either
compile-time or run-time and in both a human-readable form as well as
an encoded form suitable for direct comparison. Cairo also provides a
-macro (CAIRO_VERSION_ENCODE) to perform the encoding.
+macro (CAIRO_VERSION_ENCODE()) to perform the encoding.
</para>
<para>
@@ -100,7 +100,7 @@ to 1.0.0 could be achieved at compile-time or run-time as follows:
<informalexample><programlisting>
##if %CAIRO_VERSION >= %CAIRO_VERSION_ENCODE(1, 0, 0)
-printf ("Compiling with suitable cairo version: %%s\n", CAIRO_VERSION_STRING);
+printf ("Compiling with suitable cairo version: %%s\n", %CAIRO_VERSION_STRING);
##endif
if (cairo_version() >= %CAIRO_VERSION_ENCODE(1, 0, 0))
commit a00d71968285fc8c49903c1c84835a8be32cfbd3
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Jan 28 23:05:00 2008 -0500
[configure.in] Add commented-out #undef's for disable stable backends in cairo-features.h
diff --git a/configure.in b/configure.in
index 3ded8a5..66ec569 100644
--- a/configure.in
+++ b/configure.in
@@ -262,12 +262,15 @@ AC_DEFUN([CAIRO_BACKEND_ENABLE],
rm -f "$outfile"
AC_MSG_ERROR([failed creating $outfile])
])
+ else
+ CAIRO_NO_FEATURES="$4 $CAIRO_NO_FEATURES"
fi
fi
AM_CONDITIONAL(CAIRO_HAS_$4, test "x$use_$1" = xyes)
])
CAIRO_FEATURES=""
+CAIRO_NO_FEATURES=""
CAIRO_REQUIRES=""
CAIRO_NONPKGCONFIG_CFLAGS=""
CAIRO_NONPKGCONFIG_LIBS="$LIBM"
@@ -980,6 +983,10 @@ _EOF
for FEATURE in $CAIRO_FEATURES; do
echo "#define CAIRO_HAS_$FEATURE 1" >> $outfile
done
+ echo >> $outfile
+ for FEATURE in $CAIRO_NO_FEATURES; do
+ echo "/* #undef CAIRO_HAS_$FEATURE */" >> $outfile
+ done
echo '' >> $outfile
echo '#endif' >> $outfile
@@ -992,6 +999,7 @@ _EOF
fi
],[
CAIRO_FEATURES='$CAIRO_FEATURES'
+ CAIRO_NO_FEATURES='$CAIRO_NO_FEATURES'
CAIRO_VERSION_MAJOR=$CAIRO_VERSION_MAJOR
CAIRO_VERSION_MINOR=$CAIRO_VERSION_MINOR
CAIRO_VERSION_MICRO=$CAIRO_VERSION_MICRO
commit 6a089247a180cbc85e222520d2d93914434027be
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Mon Jan 28 22:45:06 2008 -0500
[doc] Rename cairo-font.sgml to cairo-font-face.sgml
diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index d0e5f57..f504fb3 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -19,7 +19,7 @@
</chapter>
<chapter id="Fonts">
<title>Fonts</title>
- <xi:include href="xml/cairo-font.xml"/>
+ <xi:include href="xml/cairo-font-face.xml"/>
<xi:include href="xml/cairo-scaled-font.xml"/>
<xi:include href="xml/cairo-font-options.xml"/>
<xi:include href="xml/cairo-ft.xml"/>
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index 5d47881..a36156a 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -218,7 +218,7 @@ cairo_debug_reset_static_data
</SECTION>
<SECTION>
-<FILE>cairo-font</FILE>
+<FILE>cairo-font-face</FILE>
<TITLE>cairo_font_face_t</TITLE>
cairo_font_face_t
cairo_font_face_reference
diff --git a/doc/public/tmpl/cairo-font-face.sgml b/doc/public/tmpl/cairo-font-face.sgml
new file mode 100644
index 0000000..8a4e809
--- /dev/null
+++ b/doc/public/tmpl/cairo-font-face.sgml
@@ -0,0 +1,112 @@
+<!-- ##### SECTION Title ##### -->
+cairo_font_face_t
+
+<!-- ##### SECTION Short_Description ##### -->
+Base class for font faces
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+#cairo_font_face_t represents a particular font at a particular weight,
+slant, and other characteristic but no size, transformation, or size.
+</para>
+<para>
+Font faces are created using <firstterm>font-backend</firstterm>-specific
+constructors, typically of the form
+cairo_<emphasis>backend</emphasis>_font_face_create(),
+or implicitly using the <firstterm>toy</firstterm> text API by way of
+cairo_select_font_face(). The resulting face can be accessed using
+cairo_get_font_face().
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+<itemizedlist>
+<listitem>#cairo_scaled_font_t</listitem>
+</itemizedlist>
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### TYPEDEF cairo_font_face_t ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION cairo_font_face_reference ##### -->
+<para>
+
+</para>
+
+ at font_face:
+ at Returns:
+
+
+<!-- ##### FUNCTION cairo_font_face_destroy ##### -->
+<para>
+
+</para>
+
+ at font_face:
+
+
+<!-- ##### FUNCTION cairo_font_face_status ##### -->
+<para>
+
+</para>
+
+ at font_face:
+ at Returns:
+
+
+<!-- ##### ENUM cairo_font_type_t ##### -->
+<para>
+
+</para>
+
+ at CAIRO_FONT_TYPE_TOY:
+ at CAIRO_FONT_TYPE_FT:
+ at CAIRO_FONT_TYPE_WIN32:
+ at CAIRO_FONT_TYPE_ATSUI:
+
+<!-- ##### FUNCTION cairo_font_face_get_type ##### -->
+<para>
+
+</para>
+
+ at font_face:
+ at Returns:
+
+
+<!-- ##### FUNCTION cairo_font_face_get_reference_count ##### -->
+<para>
+
+</para>
+
+ at font_face:
+ at Returns:
+
+
+<!-- ##### FUNCTION cairo_font_face_set_user_data ##### -->
+<para>
+
+</para>
+
+ at font_face:
+ at key:
+ at user_data:
+ at destroy:
+ at Returns:
+
+
+<!-- ##### FUNCTION cairo_font_face_get_user_data ##### -->
+<para>
+
+</para>
+
+ at font_face:
+ at key:
+ at Returns:
+
+
diff --git a/doc/public/tmpl/cairo-font.sgml b/doc/public/tmpl/cairo-font.sgml
deleted file mode 100644
index 8a4e809..0000000
--- a/doc/public/tmpl/cairo-font.sgml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-cairo_font_face_t
-
-<!-- ##### SECTION Short_Description ##### -->
-Base class for font faces
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#cairo_font_face_t represents a particular font at a particular weight,
-slant, and other characteristic but no size, transformation, or size.
-</para>
-<para>
-Font faces are created using <firstterm>font-backend</firstterm>-specific
-constructors, typically of the form
-cairo_<emphasis>backend</emphasis>_font_face_create(),
-or implicitly using the <firstterm>toy</firstterm> text API by way of
-cairo_select_font_face(). The resulting face can be accessed using
-cairo_get_font_face().
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<itemizedlist>
-<listitem>#cairo_scaled_font_t</listitem>
-</itemizedlist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### TYPEDEF cairo_font_face_t ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cairo_font_face_reference ##### -->
-<para>
-
-</para>
-
- at font_face:
- at Returns:
-
-
-<!-- ##### FUNCTION cairo_font_face_destroy ##### -->
-<para>
-
-</para>
-
- at font_face:
-
-
-<!-- ##### FUNCTION cairo_font_face_status ##### -->
-<para>
-
-</para>
-
- at font_face:
- at Returns:
-
-
-<!-- ##### ENUM cairo_font_type_t ##### -->
-<para>
-
-</para>
-
- at CAIRO_FONT_TYPE_TOY:
- at CAIRO_FONT_TYPE_FT:
- at CAIRO_FONT_TYPE_WIN32:
- at CAIRO_FONT_TYPE_ATSUI:
-
-<!-- ##### FUNCTION cairo_font_face_get_type ##### -->
-<para>
-
-</para>
-
- at font_face:
- at Returns:
-
-
-<!-- ##### FUNCTION cairo_font_face_get_reference_count ##### -->
-<para>
-
-</para>
-
- at font_face:
- at Returns:
-
-
-<!-- ##### FUNCTION cairo_font_face_set_user_data ##### -->
-<para>
-
-</para>
-
- at font_face:
- at key:
- at user_data:
- at destroy:
- at Returns:
-
-
-<!-- ##### FUNCTION cairo_font_face_get_user_data ##### -->
-<para>
-
-</para>
-
- at font_face:
- at key:
- at Returns:
-
-
More information about the cairo-commit
mailing list