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

[Behdad Esfahbod]

 doc/public/cairo-docs.xml |   85 ++++++++++++++++++++++------------------------
 src/cairo.h               |   28 +++++++++++++++
 2 files changed, 69 insertions(+), 44 deletions(-)

New commits:
commit 538ace5b51c968a81ea1d4c8d7538f0a227661c6
Author: Nis Martensen <nis.martensen at web.de>
Date:   Sat Jan 26 19:11:26 2008 +0100

    re-indent xml after removal of structuring level

diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index c077b65..d0e5f57 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -9,44 +9,44 @@
     <title>Cairo: A Vector Graphics Library</title>
     <releaseinfo>for Cairo &version;</releaseinfo>
   </bookinfo>
-    <chapter id="Drawing">
-      <title>Drawing</title>
-      <xi:include href="xml/cairo.xml"/>
-      <xi:include href="xml/cairo-paths.xml"/>
-      <xi:include href="xml/cairo-pattern.xml"/>
-      <xi:include href="xml/cairo-transforms.xml"/>
-      <xi:include href="xml/cairo-text.xml"/>
-    </chapter>
-    <chapter id="Fonts">
-      <title>Fonts</title>
-      <xi:include href="xml/cairo-font.xml"/>
-      <xi:include href="xml/cairo-scaled-font.xml"/>
-      <xi:include href="xml/cairo-font-options.xml"/>
-      <xi:include href="xml/cairo-ft.xml"/>
-      <xi:include href="xml/cairo-win32-fonts.xml"/>
-    </chapter>
-    <chapter id="Surfaces">
-      <title>Surfaces</title>
-      <xi:include href="xml/cairo-surface.xml"/>
-      <xi:include href="xml/cairo-image.xml"/>
-      <!--xi:include href="xml/cairo-glitz.xml"/-->
-      <xi:include href="xml/cairo-pdf.xml"/>
-      <xi:include href="xml/cairo-png.xml"/>
-      <xi:include href="xml/cairo-ps.xml"/>
-      <xi:include href="xml/cairo-win32.xml"/>
-      <!--xi:include href="xml/cairo-beos.xml"/-->
-      <xi:include href="xml/cairo-svg.xml"/>
-      <!--xi:include href="xml/cairo-quartz.xml"-->
-      <!--xi:include href="xml/cairo-xcb.xml"/-->
-      <xi:include href="xml/cairo-xlib.xml"/>
-    </chapter>
-    <chapter id="Support">
-      <title>Utilities</title>
-      <xi:include href="xml/cairo-matrix.xml"/>
-      <xi:include href="xml/cairo-status.xml"/>
-      <xi:include href="xml/cairo-version.xml"/>
-      <xi:include href="xml/cairo-types.xml"/>
-    </chapter>
+  <chapter id="Drawing">
+    <title>Drawing</title>
+    <xi:include href="xml/cairo.xml"/>
+    <xi:include href="xml/cairo-paths.xml"/>
+    <xi:include href="xml/cairo-pattern.xml"/>
+    <xi:include href="xml/cairo-transforms.xml"/>
+    <xi:include href="xml/cairo-text.xml"/>
+  </chapter>
+  <chapter id="Fonts">
+    <title>Fonts</title>
+    <xi:include href="xml/cairo-font.xml"/>
+    <xi:include href="xml/cairo-scaled-font.xml"/>
+    <xi:include href="xml/cairo-font-options.xml"/>
+    <xi:include href="xml/cairo-ft.xml"/>
+    <xi:include href="xml/cairo-win32-fonts.xml"/>
+  </chapter>
+  <chapter id="Surfaces">
+    <title>Surfaces</title>
+    <xi:include href="xml/cairo-surface.xml"/>
+    <xi:include href="xml/cairo-image.xml"/>
+    <!--xi:include href="xml/cairo-glitz.xml"/-->
+    <xi:include href="xml/cairo-pdf.xml"/>
+    <xi:include href="xml/cairo-png.xml"/>
+    <xi:include href="xml/cairo-ps.xml"/>
+    <xi:include href="xml/cairo-win32.xml"/>
+    <!--xi:include href="xml/cairo-beos.xml"/-->
+    <xi:include href="xml/cairo-svg.xml"/>
+    <!--xi:include href="xml/cairo-quartz.xml"-->
+    <!--xi:include href="xml/cairo-xcb.xml"/-->
+    <xi:include href="xml/cairo-xlib.xml"/>
+  </chapter>
+  <chapter id="Support">
+    <title>Utilities</title>
+    <xi:include href="xml/cairo-matrix.xml"/>
+    <xi:include href="xml/cairo-status.xml"/>
+    <xi:include href="xml/cairo-version.xml"/>
+    <xi:include href="xml/cairo-types.xml"/>
+  </chapter>
   <index>
     <title id="index-all">Index</title>
   </index>
commit 642e1af892353d55edd6ebe71720fb541c9deb22
Author: Nis Martensen <nis.martensen at web.de>
Date:   Sat Jan 26 19:05:16 2008 +0100

    remove empty tutorial stub and one level of structuring

diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index aa87fc5..c077b65 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -9,11 +9,6 @@
     <title>Cairo: A Vector Graphics Library</title>
     <releaseinfo>for Cairo &version;</releaseinfo>
   </bookinfo>
-  <part>
-    <title>Tutorial</title>
-  </part>				  
-  <part>
-    <title>Reference</title>
     <chapter id="Drawing">
       <title>Drawing</title>
       <xi:include href="xml/cairo.xml"/>
@@ -52,7 +47,6 @@
       <xi:include href="xml/cairo-version.xml"/>
       <xi:include href="xml/cairo-types.xml"/>
     </chapter>
-  </part>
   <index>
     <title id="index-all">Index</title>
   </index>
commit be93e61d70f4e32069448b79cca7eacab6035c6c
Author: Nis Martensen <nis.martensen at web.de>
Date:   Sat Jan 26 18:44:32 2008 +0100

    Add index of new symbols in 1.6

diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index e95a7ca..aa87fc5 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -62,5 +62,8 @@
   <index id="index-1.4" role="1.4">
     <title>Index of new symbols in 1.4</title>
   </index>
+  <index id="index-1.6" role="1.6">
+    <title>Index of new symbols in 1.6</title>
+  </index>
   <xi:include href="language-bindings.xml"/>
 </book>
commit 0874834ec4606c5ff960588077d5310927d560ba
Author: Nis Martensen <nis.martensen at web.de>
Date:   Sat Jan 26 16:59:21 2008 +0100

    Describe cairo_operator_t, add link to operators/ wiki page

diff --git a/src/cairo.h b/src/cairo.h
index f465636..177d2b1 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -342,6 +342,34 @@ cairo_pop_group_to_source (cairo_t *cr);
 
 /* Modify state */
 
+/**
+ * cairo_operator_t
+ * @CAIRO_OPERATOR_CLEAR: clear destination layer (bounded)
+ * @CAIRO_OPERATOR_SOURCE: replace destination layer (bounded)
+ * @CAIRO_OPERATOR_OVER: draw source layer on top of destination layer
+ * @CAIRO_OPERATOR_IN: draw source where there was destination content
+ * (unbounded)
+ * @CAIRO_OPERATOR_OUT: draw source where there was no destination
+ * content (unbounded)
+ * @CAIRO_OPERATOR_ATOP: draw source on top of destination content and
+ * only there
+ * @CAIRO_OPERATOR_DEST: ignore the source
+ * @CAIRO_OPERATOR_DEST_OVER: draw destination on top of source
+ * @CAIRO_OPERATOR_DEST_IN: leave destination only where there was
+ * source content (unbounded)
+ * @CAIRO_OPERATOR_DEST_OUT: leave destination only where there was no
+ * source content
+ * @CAIRO_OPERATOR_DEST_ATOP: leave destination on top of source content
+ * an only there
+ * @CAIRO_OPERATOR_XOR: pixel color xor
+ * @CAIRO_OPERATOR_ADD: pixel color addition
+ * @CAIRO_OPERATOR_SATURATE: pixel color saturation
+ *
+ * #cairo_operator_t is used to set the compositing operator for drawing
+ * operations. For a more detailed explanation of the effects of each
+ * operator, see
+ * <ulink url="http://cairographics.org/operators/">http://cairographics.org/operators/</ulink>.
+ **/
 typedef enum _cairo_operator {
     CAIRO_OPERATOR_CLEAR,