[cairo-commit] 2 commits - doc/public src/cairo-pdf.h

[Adrian Johnson]

 doc/public/cairo-sections.txt      |    9 ++++++
 doc/public/tmpl/cairo-pdf.sgml     |   35 +++++++++++++++++++++++++
 doc/public/tmpl/cairo-surface.sgml |   50 +++++++++++++++++++++++++++++++++++--
 src/cairo-pdf.h                    |    2 +
 4 files changed, 94 insertions(+), 2 deletions(-)

New commits:
commit 5ad65dc4be5964265946de59a951f2304d64159e
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Tue Dec 23 14:56:48 2008 +1030

    Document PDF restrict_to_version API

diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index 4e65860..bb64cd6 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -71,6 +71,10 @@ cairo_image_surface_get_stride
 CAIRO_HAS_PDF_SURFACE
 cairo_pdf_surface_create
 cairo_pdf_surface_create_for_stream
+cairo_pdf_surface_restrict_to_version
+cairo_pdf_version_t
+cairo_pdf_get_versions
+cairo_pdf_version_to_string
 cairo_pdf_surface_set_size
 </SECTION>
 
diff --git a/doc/public/tmpl/cairo-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml
index fabb8d7..4174109 100644
--- a/doc/public/tmpl/cairo-pdf.sgml
+++ b/doc/public/tmpl/cairo-pdf.sgml
@@ -51,6 +51,41 @@ This macro can be used to conditionally compile backend-specific code.
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_pdf_surface_restrict_to_version ##### -->
+<para>
+
+</para>
+
+ at surface: 
+ at version: 
+
+
+<!-- ##### ENUM cairo_pdf_version_t ##### -->
+<para>
+
+</para>
+
+ at CAIRO_PDF_VERSION_1_4: 
+ at CAIRO_PDF_VERSION_1_5: 
+
+<!-- ##### FUNCTION cairo_pdf_get_versions ##### -->
+<para>
+
+</para>
+
+ at versions: 
+ at num_versions: 
+
+
+<!-- ##### FUNCTION cairo_pdf_version_to_string ##### -->
+<para>
+
+</para>
+
+ at version: 
+ at Returns: 
+
+
 <!-- ##### FUNCTION cairo_pdf_surface_set_size ##### -->
 <para>
 
diff --git a/src/cairo-pdf.h b/src/cairo-pdf.h
index 294f36d..c0de538 100644
--- a/src/cairo-pdf.h
+++ b/src/cairo-pdf.h
@@ -50,6 +50,8 @@ CAIRO_BEGIN_DECLS
  *
  * #cairo_pdf_version_t is used to describe the version number of the PDF
  * specification that a generated PDF file will conform to.
+ *
+ * Since 1.10
  */
 typedef enum _cairo_pdf_version {
     CAIRO_PDF_VERSION_1_4,
commit 1869e0240bcc93c93e8abd1c8f930cf08ca8ee24
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Tue Dec 23 14:37:30 2008 +1030

    Document cairo_surface_(set|get)_mime_data() and mime types

diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index d3b7319..4e65860 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -168,6 +168,9 @@ cairo_svg_version_to_string
 <SECTION>
 <FILE>cairo-surface</FILE>
 <TITLE>surface</TITLE>
+CAIRO_MIME_TYPE_JP2
+CAIRO_MIME_TYPE_JPEG
+CAIRO_MIME_TYPE_PNG
 cairo_surface_t
 cairo_content_t
 cairo_surface_create_similar
@@ -192,6 +195,8 @@ cairo_surface_get_user_data
 cairo_surface_copy_page
 cairo_surface_show_page
 cairo_surface_has_show_text_glyphs
+cairo_surface_set_mime_data
+cairo_surface_get_mime_data
 </SECTION>
 
 <SECTION>
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index 93bfe08..f32dd49 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -27,6 +27,27 @@ cairo_<emphasis>backend</emphasis>_surface_create().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### MACRO CAIRO_MIME_TYPE_JP2 ##### -->
+<para>
+The Joint Photographic Experts Group (JPEG) 2000 image coding standard (ISO/IEC 15444-1). Since 1.10
+</para>
+
+
+
+<!-- ##### MACRO CAIRO_MIME_TYPE_JPEG ##### -->
+<para>
+The Joint Photographic Experts Group (JPEG) image coding standard (ISO/IEC 10918-1). Since 1.10
+</para>
+
+
+
+<!-- ##### MACRO CAIRO_MIME_TYPE_PNG ##### -->
+<para>
+The Portable Network Graphics image file format (ISO/IEC 15948). Since 1.10
+</para>
+
+
+
 <!-- ##### TYPEDEF cairo_surface_t ##### -->
 <para>
 
@@ -193,8 +214,8 @@ cairo_<emphasis>backend</emphasis>_surface_create().
 @CAIRO_SURFACE_TYPE_OS2: 
 @CAIRO_SURFACE_TYPE_WIN32_PRINTING: 
 @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: 
- at CAIRO_SURFACE_TYPE_SDL:
- at CAIRO_SURFACE_TYPE_SCRIPT:
+ at CAIRO_SURFACE_TYPE_SDL: 
+ at CAIRO_SURFACE_TYPE_SCRIPT: 
 
 <!-- ##### FUNCTION cairo_surface_get_type ##### -->
 <para>
@@ -261,3 +282,28 @@ cairo_<emphasis>backend</emphasis>_surface_create().
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_surface_set_mime_data ##### -->
+<para>
+
+</para>
+
+ at surface: 
+ at mime_type: 
+ at data: 
+ at length: 
+ at destroy: 
+ at closure: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION cairo_surface_get_mime_data ##### -->
+<para>
+
+</para>
+
+ at surface: 
+ at mime_type: 
+ at data: 
+ at length: 
+
+