[cairo-commit] [cairo-www] src/matrix_transform.mdwn src/operators.mdwn src/tutorial.mdwn

Chris Wilson ickle at freedesktop.org
Mon Oct 20 01:20:50 PDT 2008 

 src/matrix_transform.mdwn |    1 
 src/operators.mdwn        |    4 +--
 src/tutorial.mdwn         |   60 +++++++++++++++++++++++-----------------------
 3 files changed, 32 insertions(+), 33 deletions(-)

New commits:
commit 4b3c481f6d992753931b5022998616003cd374a8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Oct 20 09:20:32 2008 +0100

    Update links to API.

diff --git a/src/matrix_transform.mdwn b/src/matrix_transform.mdwn
index 42c64aa..5ce6c0b 100644
--- a/src/matrix_transform.mdwn
+++ b/src/matrix_transform.mdwn
@@ -30,4 +30,4 @@ The rule of matrix multiplication is illustrated with a picture here:
 In a cairo.matrix(1,2,3,4,5,6), 1 is a11, 2 is a21, 3 is a12, 4 is a22, 5 is a13 and 6 is a23.
 a31 and a32 are 0, a33 is 1. 
 
-Cairo provides matrix <a href="http://cairographics.org/manual/cairo-cairo-matrix-t.html#cairo-matrix-multiply">multiplication</a> and some other matrix <a href="http://cairographics.org/manual/cairo-cairo-matrix-t.html">functions</a>.
\ No newline at end of file
+Cairo provides matrix <a href="http://cairographics.org/manual/cairo-matrix.html#cairo-matrix-multiply">multiplication</a> and some other matrix <a href="http://cairographics.org/manual/cairo-matrix.html">functions</a>.
diff --git a/src/operators.mdwn b/src/operators.mdwn
index 3172888..1d028ce 100644
--- a/src/operators.mdwn
+++ b/src/operators.mdwn
@@ -40,7 +40,7 @@ destination.
 ## Setting the compositing operator
 
 The current operator is now set using
-[`cairo_set_operator()`](http://cairographics.org/manual/cairo-cairo-t.html#cairo-set-operator).
+[`cairo_set_operator()`](http://cairographics.org/manual/cairo-context.html#cairo-set-operator).
 
 ## The Source
 
@@ -411,7 +411,7 @@ This section augments the documentation of cairo's compositing model
 by describing how clipping and masking are taken into account when
 rendering.  In this context the <i>clip</i> and <i>mask</i> are treated as
 cairo surfaces with <a
-href=http://cairographics.org/manual/cairo-cairo-surface-t.html#cairo-content-t"">alpha
+href=http://cairographics.org/manual/cairo-surface.html#cairo-content-t"">alpha
 content</a> that both default to full opaqueness when not explicitly given.
 The basic approach to clipping in cairo is to first perform the
 operation without clipping and then interpolating by the clip
diff --git a/src/tutorial.mdwn b/src/tutorial.mdwn
index d7438f2..d76981d 100644
--- a/src/tutorial.mdwn
+++ b/src/tutorial.mdwn
@@ -152,13 +152,13 @@ all similar. They differ by how they construct the mask.
 /></a></div>
 
 The
-[`cairo_stroke()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-stroke)
+[`cairo_stroke()`](http://www.cairographics.org/manual/cairo-context.html#cairo-stroke)
 operation takes a virtual pen along the path. It allows the source to
 transfer through the mask in a thin (or thick) line around the path,
 according to the pen's
-[line width](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-set-line-width),
-[dash style](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-set-dash),
-and [line caps](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-set-line-cap).
+[line width](http://www.cairographics.org/manual/cairo-context.html#cairo-set-line-width),
+[dash style](http://www.cairographics.org/manual/cairo-context.html#cairo-set-dash),
+and [line caps](http://www.cairographics.org/manual/cairo-context.html#cairo-set-line-cap).
 
 	cairo_set_line_width (cr, 0.1);
 	cairo_set_source_rgb (cr, 0, 0, 0);
@@ -170,13 +170,13 @@ and [line caps](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-set
 <div class="tutright"><a href="fill.c"><img src="fill.png" alt="" /></a></div>
 
 The
-[`cairo_fill()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-fill)
+[`cairo_fill()`](http://www.cairographics.org/manual/cairo-context.html#cairo-fill)
 operation instead uses the path like the lines of a coloring book, and
 allows the source through the mask within the hole whose boundaries are
 the path. For complex paths (paths with multiple closed
 sub-paths&mdash;like a donut&mdash;or paths that self-intersect) this is
 influenced by the
-[fill rule](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-set-fill-rule).
+[fill rule](http://www.cairographics.org/manual/cairo-context.html#cairo-set-fill-rule).
 Note that while stroking the path transfers the source for half of the
 line width on each side of the path, filling a path fills directly up to
 the edge of the path and no further.
@@ -196,7 +196,7 @@ operation forms the mask from text. It may be easier to think of
 `cairo_show_text()` as a shortcut for creating a path with
 [`cairo_text_path()`](http://www.cairographics.org/manual/cairo-Paths.html#cairo-text-path)
 and then using
-[`cairo_fill()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-fill)
+[`cairo_fill()`](http://www.cairographics.org/manual/cairo-context.html#cairo-fill)
 to transfer it. Be aware `cairo_show_text()` caches glyphs so is much
 more efficient if you work with a lot of text.
 
@@ -216,12 +216,12 @@ more efficient if you work with a lot of text.
 /></a></div>
 
 The
-[`cairo_paint()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-paint)
+[`cairo_paint()`](http://www.cairographics.org/manual/cairo-context.html#cairo-paint)
 operation uses a mask that transfers the entire source to the
 destination. Some people consider this an infinitely large mask, and
 others consider it no mask; the result is the same. The related
 operation
-[`cairo_paint_with_alpha()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-paint-with-alpha)
+[`cairo_paint_with_alpha()`](http://www.cairographics.org/manual/cairo-context.html#cairo-paint-with-alpha)
 similarly allows transfer of the full source to destination, but it
 transfers only the provided percentage of the color.
 
@@ -233,9 +233,9 @@ transfers only the provided percentage of the color.
 <div class="tutright"><a href="mask.c"><img src="mask.png" alt="" /></a></div>
 
 The
-[`cairo_mask()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-mask)
+[`cairo_mask()`](http://www.cairographics.org/manual/cairo-context.html#cairo-mask)
 and
-[`cairo_mask_surface()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-mask-surface)
+[`cairo_mask_surface()`](http://www.cairographics.org/manual/cairo-context.html#cairo-mask-surface)
 operations allow transfer according to the transparency/opacity of a
 second source pattern or surface. Where the pattern or surface is
 opaque, the current source is transferred to the destination.  Where the
@@ -257,20 +257,20 @@ pattern or surface is transparent, nothing is transferred.
 <h1 id="L1drawing">Drawing with Cairo</h1>
 
 In order to create an image you desire, you have to prepare the
-[context](http://www.cairographics.org/manual/cairo-cairo-t.html) for
+[context](http://www.cairographics.org/manual/cairo-context.html) for
 each of the drawing verbs. To use
-[`cairo_stroke()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-stroke)
+[`cairo_stroke()`](http://www.cairographics.org/manual/cairo-context.html#cairo-stroke)
 or
-[`cairo_fill()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-fill)
+[`cairo_fill()`](http://www.cairographics.org/manual/cairo-context.html#cairo-fill)
 you first need a path. To use
-[`cairo_show_text()`](http://www.cairographics.org/manual/cairo-Text.html#cairo-show-text)
+[`cairo_show_text()`](http://www.cairographics.org/manual/cairo-text.html#cairo-show-text)
 you must position your text by its insertion point. To use
-[`cairo_mask()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-mask)
+[`cairo_mask()`](http://www.cairographics.org/manual/cairo-context.html#cairo-mask)
 you need a second source
-[pattern](http://www.cairographics.org/manual/cairo-Patterns.html) or
-[surface](http://www.cairographics.org/manual/cairo-cairo-surface-t.html).
+[pattern](http://www.cairographics.org/manual/cairo-pattern.html) or
+[surface](http://www.cairographics.org/manual/cairo-surface.html).
 And to use any of the operations, including
-[`cairo_paint()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-paint),
+[`cairo_paint()`](http://www.cairographics.org/manual/cairo-context.html#cairo-paint),
 you need a primary source.
 
 <h2 id="L2preparesource">Preparing and Selecting a Source</h2>
@@ -278,9 +278,9 @@ you need a primary source.
 There are three main kinds of sources in cairo: colors, gradients, and
 images. Colors are the simplest; they use a uniform hue and opacity for
 the entire source. You can select these without any preparation with
-[`cairo_set_source_rgb()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-set-source-rgb)
+[`cairo_set_source_rgb()`](http://www.cairographics.org/manual/cairo-context.html#cairo-set-source-rgb)
 and
-[`cairo_set_source_rgba()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-set-source-rgba).
+[`cairo_set_source_rgba()`](http://www.cairographics.org/manual/cairo-context.html#cairo-set-source-rgba).
 Using `cairo_set_source_rgb (cr, r, g, b)` is equivalent to using
 `cairo_set_source_rgba (cr, r, g, b, 1.0)`, and it sets your source
 color to use full opacity.
@@ -359,15 +359,15 @@ Images include both surfaces loaded from existing files with
 and surfaces created from within cairo as an earlier destination. As of
 cairo 1.2, the easiest way to make and use an earlier destination as a
 source is with
-[`cairo_push_group()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-push-group)
+[`cairo_push_group()`](http://www.cairographics.org/manual/cairo-context.html#cairo-push-group)
 and either
-[`cairo_pop_group()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-pop-group)
+[`cairo_pop_group()`](http://www.cairographics.org/manual/cairo-context.html#cairo-pop-group)
 or
-[`cairo_pop_group_to_source()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-pop-group-to-source).
+[`cairo_pop_group_to_source()`](http://www.cairographics.org/manual/cairo-context.html#cairo-pop-group-to-source).
 Use `cairo_pop_group_to_source()` to use it just until you select a new
 source, and `cairo_pop_group()` when you want to save it so you can
 select it over and over again with
-[`cairo_set_source()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-set-source).
+[`cairo_set_source()`](http://www.cairographics.org/manual/cairo-context.html#cairo-set-source).
 
 <h2 id="L2createpath">Creating a Path</h2>
 
@@ -389,13 +389,13 @@ path is easy to create multiple times, but a lot of paths are more complex.
 Cairo supports easily reusing paths by having alternate versions of its
 operations. Both draw the same thing, but the alternate doesn't reset
 the path.  For stroking, alongside
-[`cairo_stroke()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-stroke)
+[`cairo_stroke()`](http://www.cairographics.org/manual/cairo-context.html#cairo-stroke)
 there is
-[`cairo_stroke_preserve()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-stroke-preserve);
+[`cairo_stroke_preserve()`](http://www.cairographics.org/manual/cairo-context.html#cairo-stroke-preserve);
 for filling,
-[`cairo_fill_preserve()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-fill-preserve)
+[`cairo_fill_preserve()`](http://www.cairographics.org/manual/cairo-context.html#cairo-fill-preserve)
 joins
-[`cairo_fill()`](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-fill).
+[`cairo_fill()`](http://www.cairographics.org/manual/cairo-context.html#cairo-fill).
 Even setting the clip has a preserve variant.  Apart from choosing when
 to preserve your path, there are only a couple common operations.
 
@@ -577,7 +577,7 @@ And to add the perspective view for the overlapping layers, I set up an
 arbitrary deformation with
 [`cairo_transform()`](http://www.cairographics.org/manual/cairo-Transformations.html#cairo-transform)
 on a
-[`cairo_matrix_t`](http://www.cairographics.org/manual/cairo-cairo-matrix-t.html#cairo-matrix-t).
+[`cairo_matrix_t`](http://www.cairographics.org/manual/cairo-matrix.html#cairo-matrix-t).
 
 To understand your transforms, read them bottom to top, applying them to the
 point you're drawing. To figure out which transforms to create, think through

More information about the cairo-commit mailing list