[cairo-commit] 3 commits - boilerplate/cairo-boilerplate.c boilerplate/cairo-boilerplate-ps.c boilerplate/cairo-boilerplate-ps-private.h boilerplate/cairo-boilerplate-svg.c boilerplate/cairo-boilerplate-svg-private.h src/cairo-scaled-font.c test/big-line-ps2-ref.png test/big-line-ps2-rgb24-ref.png test/big-line-ps3-ref.png test/big-line-ps3-rgb24-ref.png test/big-line-ps-ref.png test/big-line-ps-rgb24-ref.png test/caps-joins-alpha-svg11-ref.png test/caps-joins-alpha-svg12-ref.png test/caps-joins-alpha-svg-ref.png test/caps-joins-ps2-ref.png test/caps-joins-ps3-ref.png test/caps-joins-ps-ref.png test/clip-fill-rule-ps2-argb32-ref.png test/clip-fill-rule-ps2-rgb24-ref.png test/clip-fill-rule-ps3-argb32-ref.png test/clip-fill-rule-ps3-rgb24-ref.png test/clip-fill-rule-ps-argb32-ref.png test/clip-fill-rule-ps-rgb24-ref.png test/clip-nesting-ps2-argb32-ref.png test/clip-nesting-ps2-rgb24-ref.png test/clip-nesting-ps3-argb32-ref.png test/clip-nesting-ps3-rgb24-ref.png test/clip-nesting-ps-argb32-ref.png test/clip-nesting-ps-rgb24-ref.png test/clip-operator-ps2-rgb24-ref.png test/clip-operator-ps3-ref.png test/clip-operator-ps3-rgb24-ref.png test/clip-operator-ps-rgb24-ref.png test/clipped-group-ps2-ref.png test/clipped-group-ps3-ref.png test/clipped-group-ps-ref.png test/clip-push-group-ps2-argb32-ref.png test/clip-push-group-ps2-rgb24-ref.png test/clip-push-group-ps3-argb32-ref.png test/clip-push-group-ps3-rgb24-ref.png test/clip-push-group-ps-argb32-ref.png test/clip-push-group-ps-rgb24-ref.png test/clip-twice-ps2-argb32-ref.png test/clip-twice-ps2-rgb24-ref.png test/clip-twice-ps3-argb32-ref.png test/clip-twice-ps3-rgb24-ref.png test/clip-twice-ps-argb32-ref.png test/clip-twice-ps-rgb24-ref.png test/close-path-ps2-ref.png test/close-path-ps3-ref.png test/close-path-ps-ref.png test/copy-path-ps2-ref.png test/copy-path-ps3-ref.png test/copy-path-ps-ref.png test/dash-caps-joins-ps2-argb32-ref.png test/dash-caps-joins-ps2-rgb24-ref.png test/dash-caps-joins-ps3-argb32-ref.png test/dash-caps-joins-ps3-rgb24-ref.png test/dash-caps-joins-ps-argb32-ref.png test/dash-caps-joins-ps-rgb24-ref.png test/dash-curve-ps2-ref.png test/dash-curve-ps3-ref.png test/dash-curve-ps-ref.png test/dash-scale-ps2-argb32-ref.png test/dash-scale-ps2-rgb24-ref.png test/dash-scale-ps3-argb32-ref.png test/dash-scale-ps3-rgb24-ref.png test/dash-scale-ps-argb32-ref.png test/dash-scale-ps-rgb24-ref.png test/dash-state-ps2-ref.png test/dash-state-ps3-ref.png test/dash-state-ps-ref.png test/dash-zero-length-ps2-ref.png test/dash-zero-length-ps2-rgb24-ref.png test/dash-zero-length-ps3-ref.png test/dash-zero-length-ps3-rgb24-ref.png test/dash-zero-length-ps-ref.png test/dash-zero-length-ps-rgb24-ref.png test/degenerate-arc-ps2-ref.png test/degenerate-arc-ps3-ref.png test/degenerate-arc-ps-ref.png test/degenerate-path-ps2-argb32-ref.png test/degenerate-path-ps2-rgb24-ref.png test/degenerate-path-ps3-argb32-ref.png test/degenerate-path-ps3-rgb24-ref.png test/degenerate-path-ps-argb32-ref.png test/degenerate-path-ps-rgb24-ref.png test/degenerate-pen-ps2-ref.png test/degenerate-pen-ps3-ref.png test/degenerate-pen-ps-ref.png test/device-offset-fractional-ps2-ref.png test/device-offset-fractional-ps3-ref.png test/device-offset-fractional-ps-ref.png test/extend-reflect-ps2-ref.png test/extend-reflect-ps3-ref.png test/extend-reflect-ps-ref.png test/extend-reflect-similar-ps2-ref.png test/extend-reflect-similar-ps3-ref.png test/extend-reflect-similar-ps-ref.png test/fill-alpha-pattern-ps3-ref.png test/fill-alpha-pattern-ps-ref.png test/fill-and-stroke-ps2-argb32-ref.png test/fill-and-stroke-ps2-rgb24-ref.png test/fill-and-stroke-ps3-argb32-ref.png test/fill-and-stroke-ps3-rgb24-ref.png test/fill-and-stroke-ps-argb32-ref.png test/fill-and-stroke-ps-rgb24-ref.png test/fill-missed-stop-ps2-argb32-ref.png test/fill-missed-stop-ps2-rgb24-ref.png test/fill-missed-stop-ps3-argb32-ref.png test/fill-missed-stop-ps3-rgb24-ref.png test/fill-missed-stop-ps-argb32-ref.png test/fill-missed-stop-ps-rgb24-ref.png test/fill-rule-ps2-argb32-ref.png test/fill-rule-ps2-rgb24-ref.png test/fill-rule-ps3-argb32-ref.png test/fill-rule-ps3-rgb24-ref.png test/fill-rule-ps-argb32-ref.png test/fill-rule-ps-rgb24-ref.png test/finer-grained-fallbacks-ps2-argb32-ref.png test/finer-grained-fallbacks-ps2-rgb24-ref.png test/finer-grained-fallbacks-ps3-argb32-ref.png test/finer-grained-fallbacks-ps3-rgb24-ref.png test/finer-grained-fallbacks-ps-argb32-ref.png test/finer-grained-fallbacks-ps-rgb24-ref.png test/font-matrix-translation-ps2-argb32-ref.png test/font-matrix-translation-ps2-rgb24-ref.png test/font-matrix-translation-ps3-argb32-ref.png test/font-matrix-translation-ps3-rgb24-ref.png test/font-matrix-translation-ps-argb32-ref.png test/font-matrix-translation-ps-rgb24-ref.png test/font-matrix-translation-svg11-ref.png test/font-matrix-translation-svg12-ref.png test/font-matrix-translation-svg-ref.png test/ft-show-glyphs-positioning-ps2-ref.png test/ft-show-glyphs-positioning-ps3-ref.png test/ft-show-glyphs-positioning-ps-ref.png test/ft-show-glyphs-positioning-svg11-ref.png test/ft-show-glyphs-positioning-svg12-ref.png test/ft-show-glyphs-positioning-svg-ref.png test/ft-show-glyphs-table-ps2-ref.png test/ft-show-glyphs-table-ps3-ref.png test/ft-show-glyphs-table-ps-ref.png test/ft-text-antialias-none-ps2-argb32-ref.png test/ft-text-antialias-none-ps3-argb32-ref.png test/ft-text-antialias-none-ps-argb32-ref.png test/ft-text-vertical-layout-type1-ps2-ref.png test/ft-text-vertical-layout-type1-ps3-ref.png test/ft-text-vertical-layout-type1-ps-ref.png test/ft-text-vertical-layout-type1-svg11-ref.png test/ft-text-vertical-layout-type1-svg12-ref.png test/ft-text-vertical-layout-type1-svg-ref.png test/ft-text-vertical-layout-type3-ps2-ref.png test/ft-text-vertical-layout-type3-ps3-ref.png test/ft-text-vertical-layout-type3-ps-ref.png test/ft-text-vertical-layout-type3-svg11-ref.png test/ft-text-vertical-layout-type3-svg12-ref.png test/ft-text-vertical-layout-type3-svg-ref.png test/glyph-cache-pressure-ps2-ref.png test/glyph-cache-pressure-ps3-ref.png test/glyph-cache-pressure-ps-ref.png test/gradient-alpha-ps2-argb32-ref.png test/gradient-alpha-ps2-rgb24-ref.png test/gradient-alpha-ps3-argb32-ref.png test/gradient-alpha-ps3-rgb24-ref.png test/gradient-alpha-ps-argb32-ref.png test/gradient-alpha-ps-rgb24-ref.png test/gradient-constant-alpha-ps2-ref.png test/gradient-constant-alpha-ps2-rgb24-ref.png test/gradient-constant-alpha-ps3-ref.png test/gradient-constant-alpha-ps3-rgb24-ref.png test/gradient-constant-alpha-ps-ref.png test/gradient-constant-alpha-ps-rgb24-ref.png test/infinite-join-ps2-ref.png test/infinite-join-ps3-ref.png test/infinite-join-ps-ref.png test/leaky-dashed-rectangle-ps2-ref.png test/leaky-dashed-rectangle-ps3-ref.png test/leaky-dashed-rectangle-ps-ref.png test/leaky-dash-ps2-argb32-ref.png test/leaky-dash-ps2-rgb24-ref.png test/leaky-dash-ps3-argb32-ref.png test/leaky-dash-ps3-rgb24-ref.png test/leaky-dash-ps-argb32-ref.png test/leaky-dash-ps-rgb24-ref.png test/leaky-polygon-ps2-ref.png test/leaky-polygon-ps3-ref.png test/leaky-polygon-ps-ref.png test/linear-gradient-ps3-ref.png test/linear-gradient-ps-ref.png test/linear-gradient-reflect-ps3-ref.png test/linear-gradient-reflect-ps-ref.png test/linear-gradient-svg11-ref.png test/linear-gradient-svg12-ref.png test/linear-gradient-svg-ref.png test/line-width-scale-ps2-ref.png test/line-width-scale-ps3-ref.png test/line-width-scale-ps-ref.png test/long-dashed-lines-ps2-ref.png test/long-dashed-lines-ps3-ref.png test/long-dashed-lines-ps-ref.png test/Makefile.am test/mask-alpha-svg11-argb32-ref.png test/mask-alpha-svg12-argb32-ref.png test/mask-alpha-svg-argb32-ref.png test/mask-ctm-svg11-argb32-ref.png test/mask-ctm-svg12-argb32-ref.png test/mask-ctm-svg-argb32-ref.png test/mask-surface-ctm-svg11-argb32-ref.png test/mask-surface-ctm-svg12-argb32-ref.png test/mask-surface-ctm-svg-argb32-ref.png test/mask-svg11-argb32-ref.png test/mask-svg11-rgb24-ref.png test/mask-svg12-argb32-ref.png test/mask-svg12-rgb24-ref.png test/mask-svg-argb32-ref.png test/mask-svg-rgb24-ref.png test/mask-transformed-similar-svg11-ref.png test/mask-transformed-similar-svg12-ref.png test/mask-transformed-similar-svg-ref.png test/meta-surface-pattern-ps2-argb32-ref.png test/meta-surface-pattern-ps2-rgb24-ref.png test/meta-surface-pattern-ps3-argb32-ref.png test/meta-surface-pattern-ps3-rgb24-ref.png test/meta-surface-pattern-ps-argb32-ref.png test/meta-surface-pattern-ps-rgb24-ref.png test/meta-surface-pattern-svg11-argb32-ref.png test/meta-surface-pattern-svg11-rgb24-ref.png test/meta-surface-pattern-svg12-argb32-ref.png test/meta-surface-pattern-svg12-rgb24-ref.png test/meta-surface-pattern-svg-argb32-ref.png test/meta-surface-pattern-svg-rgb24-ref.png test/new-sub-path-ps2-argb32-ref.png test/new-sub-path-ps2-rgb24-ref.png test/new-sub-path-ps3-argb32-ref.png test/new-sub-path-ps3-rgb24-ref.png test/new-sub-path-ps-argb32-ref.png test/new-sub-path-ps-rgb24-ref.png test/over-above-source-ps2-argb32-ref.png test/over-above-source-ps3-argb32-ref.png test/over-above-source-ps-argb32-ref.png test/over-around-source-ps2-argb32-ref.png test/over-around-source-ps2-rgb24-ref.png test/over-around-source-ps3-argb32-ref.png test/over-around-source-ps3-rgb24-ref.png test/over-around-source-ps-argb32-ref.png test/over-around-source-ps-rgb24-ref.png test/over-below-source-ps2-argb32-ref.png test/over-below-source-ps3-argb32-ref.png test/over-below-source-ps-argb32-ref.png test/over-between-source-ps2-argb32-ref.png test/over-between-source-ps3-argb32-ref.png test/over-between-source-ps-argb32-ref.png test/paint-source-alpha-svg11-ref.png test/paint-source-alpha-svg12-ref.png test/paint-source-alpha-svg-ref.png test/paint-with-alpha-svg11-ref.png test/paint-with-alpha-svg12-ref.png test/paint-with-alpha-svg-ref.png test/push-group-svg11-argb32-ref.png test/push-group-svg12-argb32-ref.png test/push-group-svg-argb32-ref.png test/radial-gradient-svg11-ref.png test/radial-gradient-svg12-ref.png test/radial-gradient-svg-ref.png test/random-intersections-ps2-ref.png test/random-intersections-ps3-ref.png test/random-intersections-ps-ref.png test/rectilinear-miter-limit-ps2-ref.png test/rectilinear-miter-limit-ps3-ref.png test/rectilinear-miter-limit-ps-ref.png test/reflected-stroke-ps2-ref.png test/reflected-stroke-ps3-ref.png test/reflected-stroke-ps-ref.png test/rel-path-ps2-rgb24-ref.png test/rel-path-ps3-rgb24-ref.png test/rel-path-ps-rgb24-ref.png test/rotate-image-surface-paint-ps2-ref.png test/rotate-image-surface-paint-ps3-ref.png test/rotate-image-surface-paint-ps-ref.png test/rotate-image-surface-paint-svg11-ref.png test/rotate-image-surface-paint-svg12-ref.png test/rotate-image-surface-paint-svg-ref.png test/scale-source-surface-paint-svg11-argb32-ref.png test/scale-source-surface-paint-svg11-rgb24-ref.png test/scale-source-surface-paint-svg12-argb32-ref.png test/scale-source-surface-paint-svg12-rgb24-ref.png test/scale-source-surface-paint-svg-argb32-ref.png test/scale-source-surface-paint-svg-rgb24-ref.png test/select-font-face-ps2-ref.png test/select-font-face-ps3-ref.png test/select-font-face-ps-ref.png test/self-copy-ps2-ref.png test/self-copy-ps3-ref.png test/self-copy-ps-ref.png test/set-source-svg11-argb32-ref.png test/set-source-svg12-argb32-ref.png test/set-source-svg-argb32-ref.png test/show-text-current-point-ps2-ref.png test/show-text-current-point-ps3-ref.png test/show-text-current-point-ps-ref.png test/skew-extreme-ps2-ref.png test/skew-extreme-ps3-ref.png test/skew-extreme-ps-ref.png test/smask-fill-svg11-ref.png test/smask-fill-svg12-ref.png test/smask-fill-svg-ref.png test/smask-mask-svg11-ref.png test/smask-mask-svg12-ref.png test/smask-mask-svg-ref.png test/smask-paint-svg11-ref.png test/smask-paint-svg12-ref.png test/smask-paint-svg-ref.png test/smask-ps2-ref.png test/smask-ps3-ref.png test/smask-ps-ref.png test/smask-svg11-ref.png test/smask-svg12-ref.png test/smask-svg-ref.png test/smask-text-ps2-ref.png test/smask-text-ps3-ref.png test/smask-text-ps-ref.png test/smask-text-svg11-ref.png test/smask-text-svg12-ref.png test/smask-text-svg-ref.png test/source-clip-scale-ps2-argb32-ref.png test/source-clip-scale-ps2-rgb24-ref.png test/source-clip-scale-ps3-argb32-ref.png test/source-clip-scale-ps3-rgb24-ref.png test/source-clip-scale-ps-argb32-ref.png test/source-clip-scale-ps-rgb24-ref.png test/source-clip-scale-svg11-ref.png test/source-clip-scale-svg12-ref.png test/source-clip-scale-svg-ref.png test/stroke-ctm-caps-ps2-ref.png test/stroke-ctm-caps-ps3-ref.png test/stroke-ctm-caps-ps-ref.png test/stroke-image-ps2-ref.png test/stroke-image-ps3-ref.png test/stroke-image-ps-ref.png test/surface-pattern-ps2-argb32-ref.png test/surface-pattern-ps3-argb32-ref.png test/surface-pattern-ps-argb32-ref.png test/surface-pattern-scale-down-ps2-argb32-ref.png test/surface-pattern-scale-down-ps3-argb32-ref.png test/surface-pattern-scale-down-ps-argb32-ref.png test/surface-pattern-scale-up-ps2-argb32-ref.png test/surface-pattern-scale-up-ps3-argb32-ref.png test/surface-pattern-scale-up-ps-argb32-ref.png test/surface-pattern-svg11-ref.png test/surface-pattern-svg12-ref.png test/surface-pattern-svg-ref.png test/text-pattern-ps3-argb32-ref.png test/text-pattern-ps3-rgb24-ref.png test/text-pattern-ps-argb32-ref.png test/text-pattern-ps-rgb24-ref.png test/text-pattern-svg11-argb32-ref.png test/text-pattern-svg11-rgb24-ref.png test/text-pattern-svg12-argb32-ref.png test/text-pattern-svg12-rgb24-ref.png test/text-pattern-svg-argb32-ref.png test/text-pattern-svg-rgb24-ref.png test/text-rotate-ps2-ref.png test/text-rotate-ps3-ref.png test/text-rotate-ps-ref.png test/text-rotate-svg11-ref.png test/text-rotate-svg12-ref.png test/text-rotate-svg-ref.png test/text-transform-ps2-ref.png test/text-transform-ps3-ref.png test/text-transform-ps-ref.png test/transforms-ps2-ref.png test/transforms-ps3-ref.png test/transforms-ps-ref.png test/trap-clip-ps3-argb32-ref.png test/trap-clip-ps3-rgb24-ref.png test/trap-clip-ps-argb32-ref.png test/trap-clip-ps-rgb24-ref.png test/user-font-proxy-ps2-ref.png test/user-font-proxy-ps3-ref.png test/user-font-proxy-ps-ref.png test/user-font-proxy-svg11-ref.png test/user-font-proxy-svg12-ref.png test/user-font-proxy-svg-ref.png test/user-font-ps2-ref.png test/user-font-ps3-ref.png test/user-font-ps-ref.png test/user-font-rescale-ps2-ref.png test/user-font-rescale-ps3-ref.png test/user-font-rescale-ps-ref.png test/user-font-rescale-svg11-ref.png test/user-font-rescale-svg12-ref.png test/user-font-rescale-svg-ref.png test/user-font-svg11-ref.png test/user-font-svg12-ref.png test/user-font-svg-ref.png

Chris Wilson ickle at kemper.freedesktop.org
Fri Sep 26 09:27:48 PDT 2008


 boilerplate/cairo-boilerplate-ps-private.h           |   29 +
 boilerplate/cairo-boilerplate-ps.c                   |   55 ++
 boilerplate/cairo-boilerplate-svg-private.h          |   30 +
 boilerplate/cairo-boilerplate-svg.c                  |   48 ++
 boilerplate/cairo-boilerplate.c                      |   47 ++
 dev/null                                             |binary
 src/cairo-scaled-font.c                              |    2 
 test/Makefile.am                                     |  352 ++++++++++++-------
 test/big-line-ps2-ref.png                            |binary
 test/big-line-ps2-rgb24-ref.png                      |binary
 test/big-line-ps3-ref.png                            |binary
 test/big-line-ps3-rgb24-ref.png                      |binary
 test/caps-joins-alpha-svg11-ref.png                  |binary
 test/caps-joins-alpha-svg12-ref.png                  |binary
 test/caps-joins-ps2-ref.png                          |binary
 test/caps-joins-ps3-ref.png                          |binary
 test/clip-fill-rule-ps2-argb32-ref.png               |binary
 test/clip-fill-rule-ps2-rgb24-ref.png                |binary
 test/clip-fill-rule-ps3-argb32-ref.png               |binary
 test/clip-fill-rule-ps3-rgb24-ref.png                |binary
 test/clip-nesting-ps2-argb32-ref.png                 |binary
 test/clip-nesting-ps2-rgb24-ref.png                  |binary
 test/clip-nesting-ps3-argb32-ref.png                 |binary
 test/clip-nesting-ps3-rgb24-ref.png                  |binary
 test/clip-operator-ps2-rgb24-ref.png                 |binary
 test/clip-operator-ps3-ref.png                       |binary
 test/clip-operator-ps3-rgb24-ref.png                 |binary
 test/clip-push-group-ps2-argb32-ref.png              |binary
 test/clip-push-group-ps2-rgb24-ref.png               |binary
 test/clip-push-group-ps3-argb32-ref.png              |binary
 test/clip-push-group-ps3-rgb24-ref.png               |binary
 test/clip-twice-ps2-argb32-ref.png                   |binary
 test/clip-twice-ps2-rgb24-ref.png                    |binary
 test/clip-twice-ps3-argb32-ref.png                   |binary
 test/clip-twice-ps3-rgb24-ref.png                    |binary
 test/clipped-group-ps2-ref.png                       |binary
 test/clipped-group-ps3-ref.png                       |binary
 test/close-path-ps2-ref.png                          |binary
 test/close-path-ps3-ref.png                          |binary
 test/copy-path-ps2-ref.png                           |binary
 test/copy-path-ps3-ref.png                           |binary
 test/dash-caps-joins-ps2-argb32-ref.png              |binary
 test/dash-caps-joins-ps2-rgb24-ref.png               |binary
 test/dash-caps-joins-ps3-argb32-ref.png              |binary
 test/dash-caps-joins-ps3-rgb24-ref.png               |binary
 test/dash-curve-ps2-ref.png                          |binary
 test/dash-curve-ps3-ref.png                          |binary
 test/dash-scale-ps2-argb32-ref.png                   |binary
 test/dash-scale-ps2-rgb24-ref.png                    |binary
 test/dash-scale-ps3-argb32-ref.png                   |binary
 test/dash-scale-ps3-rgb24-ref.png                    |binary
 test/dash-state-ps2-ref.png                          |binary
 test/dash-state-ps3-ref.png                          |binary
 test/dash-zero-length-ps2-ref.png                    |binary
 test/dash-zero-length-ps2-rgb24-ref.png              |binary
 test/dash-zero-length-ps3-ref.png                    |binary
 test/dash-zero-length-ps3-rgb24-ref.png              |binary
 test/degenerate-arc-ps2-ref.png                      |binary
 test/degenerate-arc-ps3-ref.png                      |binary
 test/degenerate-path-ps2-argb32-ref.png              |binary
 test/degenerate-path-ps2-rgb24-ref.png               |binary
 test/degenerate-path-ps3-argb32-ref.png              |binary
 test/degenerate-path-ps3-rgb24-ref.png               |binary
 test/degenerate-pen-ps2-ref.png                      |binary
 test/degenerate-pen-ps3-ref.png                      |binary
 test/device-offset-fractional-ps2-ref.png            |binary
 test/device-offset-fractional-ps3-ref.png            |binary
 test/extend-reflect-ps2-ref.png                      |binary
 test/extend-reflect-ps3-ref.png                      |binary
 test/extend-reflect-similar-ps2-ref.png              |binary
 test/extend-reflect-similar-ps3-ref.png              |binary
 test/fill-alpha-pattern-ps3-ref.png                  |binary
 test/fill-and-stroke-ps2-argb32-ref.png              |binary
 test/fill-and-stroke-ps2-rgb24-ref.png               |binary
 test/fill-and-stroke-ps3-argb32-ref.png              |binary
 test/fill-and-stroke-ps3-rgb24-ref.png               |binary
 test/fill-missed-stop-ps2-argb32-ref.png             |binary
 test/fill-missed-stop-ps2-rgb24-ref.png              |binary
 test/fill-missed-stop-ps3-argb32-ref.png             |binary
 test/fill-missed-stop-ps3-rgb24-ref.png              |binary
 test/fill-rule-ps2-argb32-ref.png                    |binary
 test/fill-rule-ps2-rgb24-ref.png                     |binary
 test/fill-rule-ps3-argb32-ref.png                    |binary
 test/fill-rule-ps3-rgb24-ref.png                     |binary
 test/finer-grained-fallbacks-ps2-argb32-ref.png      |binary
 test/finer-grained-fallbacks-ps2-rgb24-ref.png       |binary
 test/finer-grained-fallbacks-ps3-argb32-ref.png      |binary
 test/finer-grained-fallbacks-ps3-rgb24-ref.png       |binary
 test/font-matrix-translation-ps2-argb32-ref.png      |binary
 test/font-matrix-translation-ps2-rgb24-ref.png       |binary
 test/font-matrix-translation-ps3-argb32-ref.png      |binary
 test/font-matrix-translation-ps3-rgb24-ref.png       |binary
 test/font-matrix-translation-svg11-ref.png           |binary
 test/font-matrix-translation-svg12-ref.png           |binary
 test/ft-show-glyphs-positioning-ps2-ref.png          |binary
 test/ft-show-glyphs-positioning-ps3-ref.png          |binary
 test/ft-show-glyphs-positioning-svg11-ref.png        |binary
 test/ft-show-glyphs-positioning-svg12-ref.png        |binary
 test/ft-show-glyphs-table-ps2-ref.png                |binary
 test/ft-show-glyphs-table-ps3-ref.png                |binary
 test/ft-text-antialias-none-ps2-argb32-ref.png       |binary
 test/ft-text-antialias-none-ps3-argb32-ref.png       |binary
 test/ft-text-vertical-layout-type1-ps2-ref.png       |binary
 test/ft-text-vertical-layout-type1-ps3-ref.png       |binary
 test/ft-text-vertical-layout-type1-svg11-ref.png     |binary
 test/ft-text-vertical-layout-type1-svg12-ref.png     |binary
 test/ft-text-vertical-layout-type3-ps2-ref.png       |binary
 test/ft-text-vertical-layout-type3-ps3-ref.png       |binary
 test/ft-text-vertical-layout-type3-svg11-ref.png     |binary
 test/ft-text-vertical-layout-type3-svg12-ref.png     |binary
 test/glyph-cache-pressure-ps2-ref.png                |binary
 test/glyph-cache-pressure-ps3-ref.png                |binary
 test/gradient-alpha-ps2-argb32-ref.png               |binary
 test/gradient-alpha-ps2-rgb24-ref.png                |binary
 test/gradient-alpha-ps3-argb32-ref.png               |binary
 test/gradient-alpha-ps3-rgb24-ref.png                |binary
 test/gradient-constant-alpha-ps2-ref.png             |binary
 test/gradient-constant-alpha-ps2-rgb24-ref.png       |binary
 test/gradient-constant-alpha-ps3-ref.png             |binary
 test/gradient-constant-alpha-ps3-rgb24-ref.png       |binary
 test/infinite-join-ps2-ref.png                       |binary
 test/infinite-join-ps3-ref.png                       |binary
 test/leaky-dash-ps2-argb32-ref.png                   |binary
 test/leaky-dash-ps2-rgb24-ref.png                    |binary
 test/leaky-dash-ps3-argb32-ref.png                   |binary
 test/leaky-dash-ps3-rgb24-ref.png                    |binary
 test/leaky-dashed-rectangle-ps2-ref.png              |binary
 test/leaky-dashed-rectangle-ps3-ref.png              |binary
 test/leaky-polygon-ps2-ref.png                       |binary
 test/leaky-polygon-ps3-ref.png                       |binary
 test/line-width-scale-ps2-ref.png                    |binary
 test/line-width-scale-ps3-ref.png                    |binary
 test/linear-gradient-ps3-ref.png                     |binary
 test/linear-gradient-reflect-ps3-ref.png             |binary
 test/linear-gradient-svg11-ref.png                   |binary
 test/linear-gradient-svg12-ref.png                   |binary
 test/long-dashed-lines-ps2-ref.png                   |binary
 test/long-dashed-lines-ps3-ref.png                   |binary
 test/mask-alpha-svg11-argb32-ref.png                 |binary
 test/mask-alpha-svg12-argb32-ref.png                 |binary
 test/mask-ctm-svg11-argb32-ref.png                   |binary
 test/mask-ctm-svg12-argb32-ref.png                   |binary
 test/mask-surface-ctm-svg11-argb32-ref.png           |binary
 test/mask-surface-ctm-svg12-argb32-ref.png           |binary
 test/mask-svg11-argb32-ref.png                       |binary
 test/mask-svg11-rgb24-ref.png                        |binary
 test/mask-svg12-argb32-ref.png                       |binary
 test/mask-svg12-rgb24-ref.png                        |binary
 test/mask-transformed-similar-svg11-ref.png          |binary
 test/mask-transformed-similar-svg12-ref.png          |binary
 test/meta-surface-pattern-ps2-argb32-ref.png         |binary
 test/meta-surface-pattern-ps2-rgb24-ref.png          |binary
 test/meta-surface-pattern-ps3-argb32-ref.png         |binary
 test/meta-surface-pattern-ps3-rgb24-ref.png          |binary
 test/meta-surface-pattern-svg11-argb32-ref.png       |binary
 test/meta-surface-pattern-svg11-rgb24-ref.png        |binary
 test/meta-surface-pattern-svg12-argb32-ref.png       |binary
 test/meta-surface-pattern-svg12-rgb24-ref.png        |binary
 test/new-sub-path-ps2-argb32-ref.png                 |binary
 test/new-sub-path-ps2-rgb24-ref.png                  |binary
 test/new-sub-path-ps3-argb32-ref.png                 |binary
 test/new-sub-path-ps3-rgb24-ref.png                  |binary
 test/over-above-source-ps2-argb32-ref.png            |binary
 test/over-above-source-ps3-argb32-ref.png            |binary
 test/over-around-source-ps2-argb32-ref.png           |binary
 test/over-around-source-ps2-rgb24-ref.png            |binary
 test/over-around-source-ps3-argb32-ref.png           |binary
 test/over-around-source-ps3-rgb24-ref.png            |binary
 test/over-below-source-ps2-argb32-ref.png            |binary
 test/over-below-source-ps3-argb32-ref.png            |binary
 test/over-between-source-ps2-argb32-ref.png          |binary
 test/over-between-source-ps3-argb32-ref.png          |binary
 test/paint-source-alpha-svg11-ref.png                |binary
 test/paint-source-alpha-svg12-ref.png                |binary
 test/paint-with-alpha-svg11-ref.png                  |binary
 test/paint-with-alpha-svg12-ref.png                  |binary
 test/push-group-svg11-argb32-ref.png                 |binary
 test/push-group-svg12-argb32-ref.png                 |binary
 test/radial-gradient-svg11-ref.png                   |binary
 test/radial-gradient-svg12-ref.png                   |binary
 test/random-intersections-ps2-ref.png                |binary
 test/random-intersections-ps3-ref.png                |binary
 test/rectilinear-miter-limit-ps2-ref.png             |binary
 test/rectilinear-miter-limit-ps3-ref.png             |binary
 test/reflected-stroke-ps2-ref.png                    |binary
 test/reflected-stroke-ps3-ref.png                    |binary
 test/rel-path-ps2-rgb24-ref.png                      |binary
 test/rel-path-ps3-rgb24-ref.png                      |binary
 test/rotate-image-surface-paint-ps2-ref.png          |binary
 test/rotate-image-surface-paint-ps3-ref.png          |binary
 test/rotate-image-surface-paint-svg11-ref.png        |binary
 test/rotate-image-surface-paint-svg12-ref.png        |binary
 test/scale-source-surface-paint-svg11-argb32-ref.png |binary
 test/scale-source-surface-paint-svg11-rgb24-ref.png  |binary
 test/scale-source-surface-paint-svg12-argb32-ref.png |binary
 test/scale-source-surface-paint-svg12-rgb24-ref.png  |binary
 test/select-font-face-ps2-ref.png                    |binary
 test/select-font-face-ps3-ref.png                    |binary
 test/self-copy-ps2-ref.png                           |binary
 test/self-copy-ps3-ref.png                           |binary
 test/set-source-svg11-argb32-ref.png                 |binary
 test/set-source-svg12-argb32-ref.png                 |binary
 test/show-text-current-point-ps2-ref.png             |binary
 test/show-text-current-point-ps3-ref.png             |binary
 test/skew-extreme-ps2-ref.png                        |binary
 test/skew-extreme-ps3-ref.png                        |binary
 test/smask-fill-svg11-ref.png                        |binary
 test/smask-fill-svg12-ref.png                        |binary
 test/smask-mask-svg11-ref.png                        |binary
 test/smask-mask-svg12-ref.png                        |binary
 test/smask-paint-svg11-ref.png                       |binary
 test/smask-paint-svg12-ref.png                       |binary
 test/smask-ps2-ref.png                               |binary
 test/smask-ps3-ref.png                               |binary
 test/smask-svg11-ref.png                             |binary
 test/smask-svg12-ref.png                             |binary
 test/smask-text-ps2-ref.png                          |binary
 test/smask-text-ps3-ref.png                          |binary
 test/smask-text-svg11-ref.png                        |binary
 test/smask-text-svg12-ref.png                        |binary
 test/source-clip-scale-ps2-argb32-ref.png            |binary
 test/source-clip-scale-ps2-rgb24-ref.png             |binary
 test/source-clip-scale-ps3-argb32-ref.png            |binary
 test/source-clip-scale-ps3-rgb24-ref.png             |binary
 test/source-clip-scale-svg11-ref.png                 |binary
 test/source-clip-scale-svg12-ref.png                 |binary
 test/stroke-ctm-caps-ps2-ref.png                     |binary
 test/stroke-ctm-caps-ps3-ref.png                     |binary
 test/stroke-image-ps2-ref.png                        |binary
 test/stroke-image-ps3-ref.png                        |binary
 test/surface-pattern-ps2-argb32-ref.png              |binary
 test/surface-pattern-ps3-argb32-ref.png              |binary
 test/surface-pattern-scale-down-ps2-argb32-ref.png   |binary
 test/surface-pattern-scale-down-ps3-argb32-ref.png   |binary
 test/surface-pattern-scale-up-ps2-argb32-ref.png     |binary
 test/surface-pattern-scale-up-ps3-argb32-ref.png     |binary
 test/surface-pattern-svg11-ref.png                   |binary
 test/surface-pattern-svg12-ref.png                   |binary
 test/text-pattern-ps3-argb32-ref.png                 |binary
 test/text-pattern-ps3-rgb24-ref.png                  |binary
 test/text-pattern-svg11-argb32-ref.png               |binary
 test/text-pattern-svg11-rgb24-ref.png                |binary
 test/text-pattern-svg12-argb32-ref.png               |binary
 test/text-pattern-svg12-rgb24-ref.png                |binary
 test/text-rotate-ps2-ref.png                         |binary
 test/text-rotate-ps3-ref.png                         |binary
 test/text-rotate-svg11-ref.png                       |binary
 test/text-rotate-svg12-ref.png                       |binary
 test/text-transform-ps2-ref.png                      |binary
 test/text-transform-ps3-ref.png                      |binary
 test/transforms-ps2-ref.png                          |binary
 test/transforms-ps3-ref.png                          |binary
 test/trap-clip-ps3-argb32-ref.png                    |binary
 test/trap-clip-ps3-rgb24-ref.png                     |binary
 test/user-font-proxy-ps2-ref.png                     |binary
 test/user-font-proxy-ps3-ref.png                     |binary
 test/user-font-proxy-svg11-ref.png                   |binary
 test/user-font-proxy-svg12-ref.png                   |binary
 test/user-font-ps2-ref.png                           |binary
 test/user-font-ps3-ref.png                           |binary
 test/user-font-rescale-ps2-ref.png                   |binary
 test/user-font-rescale-ps3-ref.png                   |binary
 test/user-font-rescale-svg11-ref.png                 |binary
 test/user-font-rescale-svg12-ref.png                 |binary
 test/user-font-svg11-ref.png                         |binary
 test/user-font-svg12-ref.png                         |binary
 266 files changed, 406 insertions(+), 157 deletions(-)

New commits:
commit fc12267405e98497c9f086d49fa6501d8f671a68
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Sep 26 17:10:52 2008 +0100

    [scaled-font] Spelling fix.
    
    Arbitrary spelling fix.

diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index d8d78f4..c548655 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -573,7 +573,7 @@ _cairo_scaled_font_keys_equal (const void *abstract_key_a, const void *abstract_
 	    cairo_font_options_equal (&key_a->options, &key_b->options));
 }
 
-/* XXX: This 256 number is arbitary---we've never done any measurement
+/* XXX: This 256 number is arbitrary---we've never done any measurement
  * of this. In fact, having a per-font glyph caches each managed
  * separately is probably not what we want anyway. Would probably be
  * much better to have a single cache for glyphs with random
commit e0f214710760a0e0332207cb3009e3119867bd13
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Sep 26 16:49:57 2008 +0100

    [boilerplate] Add a PS 2 target.
    
    Ensure that we can generate PS2 output when required by creating a PS
    level 2 target and using GhostScript for conformance testing.

diff --git a/boilerplate/cairo-boilerplate-ps-private.h b/boilerplate/cairo-boilerplate-ps-private.h
index 6f1bad6..a6a1950 100644
--- a/boilerplate/cairo-boilerplate-ps-private.h
+++ b/boilerplate/cairo-boilerplate-ps-private.h
@@ -28,15 +28,26 @@
 #define _CAIRO_BOILERPLATE_PS_PRIVATE_H_
 
 cairo_surface_t *
-_cairo_boilerplate_ps_create_surface (const char		 *name,
-				      cairo_content_t		  content,
-				      int			  width,
-				      int			  height,
-				      int			  max_width,
-				      int			  max_height,
-				      cairo_boilerplate_mode_t	  mode,
-				      int                         id,
-				      void			**closure);
+_cairo_boilerplate_ps2_create_surface (const char		 *name,
+				       cairo_content_t		  content,
+				       int			  width,
+				       int			  height,
+				       int			  max_width,
+				       int			  max_height,
+				       cairo_boilerplate_mode_t	  mode,
+				       int                        id,
+				       void			**closure);
+
+cairo_surface_t *
+_cairo_boilerplate_ps3_create_surface (const char		 *name,
+				       cairo_content_t		  content,
+				       int			  width,
+				       int			  height,
+				       int			  max_width,
+				       int			  max_height,
+				       cairo_boilerplate_mode_t	  mode,
+				       int                        id,
+				       void			**closure);
 
 void
 _cairo_boilerplate_ps_cleanup (void *closure);
diff --git a/boilerplate/cairo-boilerplate-ps.c b/boilerplate/cairo-boilerplate-ps.c
index 6df9776..7c6ebe9 100644
--- a/boilerplate/cairo-boilerplate-ps.c
+++ b/boilerplate/cairo-boilerplate-ps.c
@@ -37,14 +37,14 @@
 #include <signal.h>
 #endif
 
-cairo_user_data_key_t	ps_closure_key;
+static const cairo_user_data_key_t ps_closure_key;
 
-typedef struct _ps_target_closure
-{
+typedef struct _ps_target_closure {
     char		*filename;
     int			 width;
     int			 height;
     cairo_surface_t	*target;
+    cairo_ps_level_t	 level;
 } ps_target_closure_t;
 
 static cairo_status_t
@@ -65,9 +65,10 @@ _cairo_boilerplate_ps_surface_set_creation_date (cairo_surface_t *abstract_surfa
     return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_surface_t *
+static cairo_surface_t *
 _cairo_boilerplate_ps_create_surface (const char		 *name,
 				      cairo_content_t		  content,
+				      cairo_ps_level_t		  level,
 				      int			  width,
 				      int			  height,
 				      int			  max_width,
@@ -89,6 +90,7 @@ _cairo_boilerplate_ps_create_surface (const char		 *name,
     xasprintf (&ptc->filename, "%s-out.ps", name);
     xunlink (ptc->filename);
 
+    ptc->level = level;
     ptc->width = width;
     ptc->height = height;
 
@@ -96,6 +98,7 @@ _cairo_boilerplate_ps_create_surface (const char		 *name,
     if (cairo_surface_status (surface))
 	goto CLEANUP_FILENAME;
 
+    cairo_ps_surface_restrict_to_level (surface, level);
     _cairo_boilerplate_ps_surface_set_creation_date (surface, 0);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
@@ -125,6 +128,44 @@ _cairo_boilerplate_ps_create_surface (const char		 *name,
     return surface;
 }
 
+cairo_surface_t *
+_cairo_boilerplate_ps2_create_surface (const char		 *name,
+				       cairo_content_t		  content,
+				       int			  width,
+				       int			  height,
+				       int			  max_width,
+				       int			  max_height,
+				       cairo_boilerplate_mode_t	  mode,
+				       int                        id,
+				       void			**closure)
+{
+    return _cairo_boilerplate_ps_create_surface (name, content,
+						 CAIRO_PS_LEVEL_2,
+						 width, height,
+						 max_width, max_height,
+						 mode, id,
+						 closure);
+}
+
+cairo_surface_t *
+_cairo_boilerplate_ps3_create_surface (const char		 *name,
+				       cairo_content_t		  content,
+				       int			  width,
+				       int			  height,
+				       int			  max_width,
+				       int			  max_height,
+				       cairo_boilerplate_mode_t	  mode,
+				       int                        id,
+				       void			**closure)
+{
+    return _cairo_boilerplate_ps_create_surface (name, content,
+						 CAIRO_PS_LEVEL_3,
+						 width, height,
+						 max_width, max_height,
+						 mode, id,
+						 closure);
+}
+
 cairo_status_t
 _cairo_boilerplate_ps_finish_surface (cairo_surface_t		*surface)
 {
@@ -177,8 +218,10 @@ _cairo_boilerplate_ps_surface_write_to_png (cairo_surface_t *surface, const char
     char    command[4096];
     int exitstatus;
 
-    sprintf (command, "gs -q -r72 -g%dx%d -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pngalpha -sOutputFile=%s %s",
-	     ptc->width, ptc->height, filename, ptc->filename);
+    sprintf (command, "gs -q -r72 -g%dx%d -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pngalpha -sOutputFile=%s %s %s",
+	     ptc->width, ptc->height, filename,
+	     ptc->level == CAIRO_PS_LEVEL_2 ? "-c 2 .setlanguagelevel -f" : "",
+	     ptc->filename);
     exitstatus = system (command);
 #if _XOPEN_SOURCE && HAVE_SIGNAL_H
     if (WIFSIGNALED (exitstatus))
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index 7c9890f..f88d983 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -445,16 +445,31 @@ static cairo_boilerplate_target_t targets[] =
       _cairo_boilerplate_xlib_synchronize},
 #endif
 #if CAIRO_HAS_PS_SURFACE && CAIRO_CAN_TEST_PS_SURFACE
-    { "ps", ".ps", CAIRO_SURFACE_TYPE_PS,
+    { "ps2", ".ps", CAIRO_SURFACE_TYPE_PS,
       CAIRO_TEST_CONTENT_COLOR_ALPHA_FLATTENED, 0,
-      _cairo_boilerplate_ps_create_surface,
+      _cairo_boilerplate_ps2_create_surface,
       _cairo_boilerplate_ps_finish_surface,
       _cairo_boilerplate_ps_get_image_surface,
       _cairo_boilerplate_ps_surface_write_to_png,
       _cairo_boilerplate_ps_cleanup,
       NULL, TRUE },
-    { "ps", ".ps", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 0,
-      _cairo_boilerplate_ps_create_surface,
+    { "ps2", ".ps", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 0,
+      _cairo_boilerplate_ps2_create_surface,
+      _cairo_boilerplate_ps_finish_surface,
+      _cairo_boilerplate_ps_get_image_surface,
+      _cairo_boilerplate_ps_surface_write_to_png,
+      _cairo_boilerplate_ps_cleanup,
+      NULL, TRUE },
+    { "ps3", ".ps", CAIRO_SURFACE_TYPE_PS,
+      CAIRO_TEST_CONTENT_COLOR_ALPHA_FLATTENED, 0,
+      _cairo_boilerplate_ps3_create_surface,
+      _cairo_boilerplate_ps_finish_surface,
+      _cairo_boilerplate_ps_get_image_surface,
+      _cairo_boilerplate_ps_surface_write_to_png,
+      _cairo_boilerplate_ps_cleanup,
+      NULL, TRUE },
+    { "ps3", ".ps", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 0,
+      _cairo_boilerplate_ps3_create_surface,
       _cairo_boilerplate_ps_finish_surface,
       _cairo_boilerplate_ps_get_image_surface,
       _cairo_boilerplate_ps_surface_write_to_png,
diff --git a/test/Makefile.am b/test/Makefile.am
index 0a0d499..9f3c0f1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -297,8 +297,10 @@ REFERENCE_IMAGES = \
 	alpha-similar-rgb24-ref.png	\
 	big-line-ref.png		\
 	big-line-rgb24-ref.png		\
-	big-line-ps-ref.png		\
-	big-line-ps-rgb24-ref.png	\
+	big-line-ps2-ref.png		\
+	big-line-ps3-ref.png		\
+	big-line-ps2-rgb24-ref.png	\
+	big-line-ps3-rgb24-ref.png	\
 	big-line-quartz-ref.png		\
 	big-line-quartz-rgb24-ref.png	\
 	bilevel-image-ref.png		\
@@ -310,18 +312,23 @@ REFERENCE_IMAGES = \
 	caps-joins-alpha-svg12-ref.png	\
 	caps-joins-alpha-svg11-ref.png	\
 	caps-joins-ref.png	\
-	caps-joins-ps-ref.png	\
+	caps-joins-ps2-ref.png	\
+	caps-joins-ps3-ref.png	\
 	caps-sub-paths-ref.png	\
 	clip-all-ref.png	\
 	clip-empty-ref.png	\
 	clip-fill-rule-pixel-aligned-ref.png	\
 	clip-fill-rule-pixel-aligned-rgb24-ref.png	\
-	clip-fill-rule-ps-argb32-ref.png	\
-	clip-fill-rule-ps-rgb24-ref.png		\
+	clip-fill-rule-ps2-argb32-ref.png	\
+	clip-fill-rule-ps3-argb32-ref.png	\
+	clip-fill-rule-ps2-rgb24-ref.png		\
+	clip-fill-rule-ps3-rgb24-ref.png		\
 	clip-fill-rule-ref.png	\
 	clip-fill-rule-rgb24-ref.png	\
-	clip-nesting-ps-argb32-ref.png	\
-	clip-nesting-ps-rgb24-ref.png	\
+	clip-nesting-ps2-argb32-ref.png	\
+	clip-nesting-ps3-argb32-ref.png	\
+	clip-nesting-ps2-rgb24-ref.png	\
+	clip-nesting-ps3-rgb24-ref.png	\
 	clip-nesting-quartz-ref.png	\
 	clip-nesting-quartz-rgb24-ref.png	\
 	clip-nesting-ref.png	\
@@ -329,28 +336,36 @@ REFERENCE_IMAGES = \
 	clip-operator-ref.png	\
 	clip-operator-pdf-argb32-ref.png \
 	clip-operator-pdf-rgb24-ref.png \
-	clip-operator-ps-rgb24-ref.png	\
+	clip-operator-ps2-rgb24-ref.png	\
+	clip-operator-ps3-rgb24-ref.png	\
 	clip-operator-rgb24-ref.png	\
 	clip-operator-quartz-ref.png	\
 	clip-operator-quartz-rgb24-ref.png	\
-	clip-push-group-ps-argb32-ref.png	\
-	clip-push-group-ps-rgb24-ref.png	\
+	clip-push-group-ps2-argb32-ref.png	\
+	clip-push-group-ps3-argb32-ref.png	\
+	clip-push-group-ps2-rgb24-ref.png	\
+	clip-push-group-ps3-rgb24-ref.png	\
 	clip-push-group-quartz-ref.png	\
 	clip-push-group-ref.png	\
-	clip-twice-ps-argb32-ref.png	\
-	clip-twice-ps-rgb24-ref.png	\
+	clip-twice-ps2-argb32-ref.png	\
+	clip-twice-ps3-argb32-ref.png	\
+	clip-twice-ps2-rgb24-ref.png	\
+	clip-twice-ps3-rgb24-ref.png	\
 	clip-twice-quartz-ref.png	\
 	clip-twice-quartz-rgb24-ref.png	\
 	clip-twice-ref.png	\
 	clip-twice-rgb24-ref.png	\
 	clipped-group-ref.png	\
-	clipped-group-ps-ref.png	\
+	clipped-group-ps2-ref.png	\
+	clipped-group-ps3-ref.png	\
 	close-path-ref.png	\
-	close-path-ps-ref.png	\
+	close-path-ps2-ref.png	\
+	close-path-ps3-ref.png	\
 	composite-integer-translate-over-ref.png	\
 	composite-integer-translate-over-repeat-ref.png	\
 	composite-integer-translate-source-ref.png	\
-	copy-path-ps-ref.png	\
+	copy-path-ps2-ref.png	\
+	copy-path-ps3-ref.png	\
 	copy-path-ref.png	\
 	create-from-png-ref.png			\
 	create-from-png-alpha-ref.png		\
@@ -359,40 +374,53 @@ REFERENCE_IMAGES = \
 	create-from-png-indexed-ref.png		\
 	create-from-png-indexed-alpha-ref.png	\
 	create-from-png-stream-ref.png	\
-	dash-caps-joins-ps-argb32-ref.png	\
-	dash-caps-joins-ps-rgb24-ref.png	\
+	dash-caps-joins-ps2-argb32-ref.png	\
+	dash-caps-joins-ps3-argb32-ref.png	\
+	dash-caps-joins-ps2-rgb24-ref.png	\
+	dash-caps-joins-ps3-rgb24-ref.png	\
 	dash-caps-joins-quartz-ref.png	\
 	dash-caps-joins-ref.png	\
 	dash-curve-ref.png	\
-	dash-curve-ps-ref.png \
+	dash-curve-ps2-ref.png \
+	dash-curve-ps3-ref.png \
 	dash-curve-quartz-ref.png \
 	dash-no-dash-ref.png	\
 	dash-offset-negative-ref.png	\
-	dash-scale-ps-argb32-ref.png	\
-	dash-scale-ps-rgb24-ref.png	\
+	dash-scale-ps2-argb32-ref.png	\
+	dash-scale-ps3-argb32-ref.png	\
+	dash-scale-ps2-rgb24-ref.png	\
+	dash-scale-ps3-rgb24-ref.png	\
 	dash-scale-quartz-ref.png	\
 	dash-scale-ref.png	\
-	dash-state-ps-ref.png	\
+	dash-state-ps2-ref.png	\
+	dash-state-ps3-ref.png	\
 	dash-state-ref.png	\
 	dash-state-quartz-ref.png	\
-	dash-zero-length-ps-ref.png	\
-	dash-zero-length-ps-rgb24-ref.png	\
+	dash-zero-length-ps2-ref.png	\
+	dash-zero-length-ps3-ref.png	\
+	dash-zero-length-ps2-rgb24-ref.png	\
+	dash-zero-length-ps3-rgb24-ref.png	\
 	dash-zero-length-ref.png	\
 	dash-zero-length-rgb24-ref.png	\
 	degenerate-arc-ref.png		\
-	degenerate-arc-ps-ref.png	\
+	degenerate-arc-ps2-ref.png	\
+	degenerate-arc-ps3-ref.png	\
 	degenerate-pen-ref.png		\
-	degenerate-pen-ps-ref.png	\
+	degenerate-pen-ps2-ref.png	\
+	degenerate-pen-ps3-ref.png	\
 	degenerate-pen-quartz-ref.png	\
-	degenerate-path-ps-argb32-ref.png	\
-	degenerate-path-ps-rgb24-ref.png	\
+	degenerate-path-ps2-argb32-ref.png	\
+	degenerate-path-ps3-argb32-ref.png	\
+	degenerate-path-ps2-rgb24-ref.png	\
+	degenerate-path-ps2-rgb24-ref.png	\
 	degenerate-path-ref.png	\
 	degenerate-path-rgb24-ref.png	\
 	degenerate-path-quartz-ref.png	\
 	degenerate-path-quartz-rgb24-ref.png	\
 	device-offset-fractional-ref.png	\
 	device-offset-fractional-pdf-ref.png	\
-	device-offset-fractional-ps-ref.png	\
+	device-offset-fractional-ps2-ref.png	\
+	device-offset-fractional-ps3-ref.png	\
 	device-offset-positive-ref.png	\
 	device-offset-positive-rgb24-ref.png	\
 	device-offset-ref.png	\
@@ -401,21 +429,25 @@ REFERENCE_IMAGES = \
 	extend-pad-ref.png	\
 	extend-reflect-ref.png	\
 	extend-reflect-similar-ref.png	\
-	extend-reflect-similar-ps-ref.png	\
-	extend-reflect-ps-ref.png \
+	extend-reflect-similar-ps2-ref.png	\
+	extend-reflect-similar-ps3-ref.png	\
+	extend-reflect-ps2-ref.png \
+	extend-reflect-ps3-ref.png \
 	extend-repeat-ref.png	\
 	extend-repeat-similar-ref.png	\
 	fill-alpha-ref.png	\
 	fill-alpha-pattern-ref.png	\
 	fill-alpha-pattern-pdf-argb32-ref.png	\
 	fill-alpha-pattern-pdf-rgb24-ref.png	\
-	fill-alpha-pattern-ps-ref.png	\
+	fill-alpha-pattern-ps3-ref.png	\
 	fill-and-stroke-alpha-add-quartz-ref.png	\
 	fill-and-stroke-alpha-add-ref.png	\
 	fill-and-stroke-alpha-quartz-ref.png	\
 	fill-and-stroke-alpha-ref.png	\
-	fill-and-stroke-ps-argb32-ref.png	\
-	fill-and-stroke-ps-rgb24-ref.png	\
+	fill-and-stroke-ps2-argb32-ref.png	\
+	fill-and-stroke-ps3-argb32-ref.png	\
+	fill-and-stroke-ps2-rgb24-ref.png	\
+	fill-and-stroke-ps3-rgb24-ref.png	\
 	fill-and-stroke-quartz-ref.png	\
 	fill-and-stroke-quartz-rgb24-ref.png	\
 	fill-and-stroke-ref.png	\
@@ -424,62 +456,80 @@ REFERENCE_IMAGES = \
 	fill-degenerate-sort-order-quartz-rgb24-ref.png	\
 	fill-degenerate-sort-order-ref.png	\
 	fill-degenerate-sort-order-rgb24-ref.png	\
-	fill-missed-stop-ps-argb32-ref.png	\
-	fill-missed-stop-ps-rgb24-ref.png	\
+	fill-missed-stop-ps2-argb32-ref.png	\
+	fill-missed-stop-ps3-argb32-ref.png	\
+	fill-missed-stop-ps2-rgb24-ref.png	\
+	fill-missed-stop-ps3-rgb24-ref.png	\
 	fill-missed-stop-ref.png	\
 	fill-missed-stop-rgb24-ref.png	\
-	fill-rule-ps-argb32-ref.png	\
+	fill-rule-ps2-argb32-ref.png	\
+	fill-rule-ps3-argb32-ref.png	\
+	fill-rule-ps2-rgb24-ref.png \
+	fill-rule-ps3-rgb24-ref.png \
 	fill-rule-quartz-ref.png	\
 	fill-rule-quartz-rgb24-ref.png	\
 	fill-rule-ref.png	\
 	fill-rule-rgb24-ref.png	\
-	fill-rule-ps-rgb24-ref.png \
 	filter-bilinear-extents-ref.png \
 	filter-nearest-offset-ref.png	\
 	finer-grained-fallbacks-ref.png			\
 	finer-grained-fallbacks-rgb24-ref.png		\
-	finer-grained-fallbacks-ps-argb32-ref.png	\
-	finer-grained-fallbacks-ps-rgb24-ref.png	\
-	font-matrix-translation-ps-argb32-ref.png	\
-	font-matrix-translation-ps-rgb24-ref.png	\
+	finer-grained-fallbacks-ps2-argb32-ref.png	\
+	finer-grained-fallbacks-ps3-argb32-ref.png	\
+	finer-grained-fallbacks-ps2-rgb24-ref.png	\
+	finer-grained-fallbacks-ps3-rgb24-ref.png	\
+	font-matrix-translation-ps2-argb32-ref.png	\
+	font-matrix-translation-ps3-argb32-ref.png	\
+	font-matrix-translation-ps2-rgb24-ref.png	\
+	font-matrix-translation-ps3-rgb24-ref.png	\
 	font-matrix-translation-ref.png	\
 	font-matrix-translation-svg12-ref.png	\
 	font-matrix-translation-svg11-ref.png	\
 	font-matrix-translation-quartz-ref.png \
-	ft-text-antialias-none-ps-argb32-ref.png	\
+	ft-text-antialias-none-ps2-argb32-ref.png	\
+	ft-text-antialias-none-ps3-argb32-ref.png	\
 	ft-text-antialias-none-ref.png	\
 	ft-show-glyphs-positioning-ref.png		\
 	ft-show-glyphs-positioning-pdf-ref.png		\
-	ft-show-glyphs-positioning-ps-ref.png		\
+	ft-show-glyphs-positioning-ps2-ref.png		\
+	ft-show-glyphs-positioning-ps3-ref.png		\
 	ft-show-glyphs-positioning-svg12-ref.png		\
 	ft-show-glyphs-positioning-svg11-ref.png		\
 	ft-show-glyphs-table-ref.png			\
-	ft-show-glyphs-table-ps-ref.png			\
+	ft-show-glyphs-table-ps2-ref.png			\
+	ft-show-glyphs-table-ps3-ref.png			\
 	ft-text-vertical-layout-type1-pdf-ref.png	\
-	ft-text-vertical-layout-type1-ps-ref.png	\
+	ft-text-vertical-layout-type1-ps2-ref.png	\
+	ft-text-vertical-layout-type1-ps3-ref.png	\
 	ft-text-vertical-layout-type1-ref.png	\
 	ft-text-vertical-layout-type1-svg12-ref.png	\
 	ft-text-vertical-layout-type1-svg11-ref.png	\
 	ft-text-vertical-layout-type3-pdf-ref.png	\
-	ft-text-vertical-layout-type3-ps-ref.png	\
+	ft-text-vertical-layout-type3-ps2-ref.png	\
+	ft-text-vertical-layout-type3-ps3-ref.png	\
 	ft-text-vertical-layout-type3-ref.png	\
 	ft-text-vertical-layout-type3-svg12-ref.png	\
 	ft-text-vertical-layout-type3-svg11-ref.png	\
 	get-group-target-ref.png	\
 	glitz-surface-source-ref.png \
 	glyph-cache-pressure-ref.png	\
-	glyph-cache-pressure-ps-ref.png	\
+	glyph-cache-pressure-ps2-ref.png	\
+	glyph-cache-pressure-ps3-ref.png	\
 	glyph-cache-pressure-quartz-ref.png	\
 	gradient-alpha-pdf-argb32-ref.png	\
 	gradient-alpha-pdf-rgb24-ref.png	\
-	gradient-alpha-ps-argb32-ref.png	\
-	gradient-alpha-ps-rgb24-ref.png	\
+	gradient-alpha-ps2-argb32-ref.png	\
+	gradient-alpha-ps3-argb32-ref.png	\
+	gradient-alpha-ps2-rgb24-ref.png	\
+	gradient-alpha-ps3-rgb24-ref.png	\
 	gradient-alpha-ref.png	\
 	gradient-alpha-rgb24-ref.png	\
 	gradient-constant-alpha-pdf-argb32-ref.png	\
 	gradient-constant-alpha-pdf-rgb24-ref.png	\
-	gradient-constant-alpha-ps-ref.png		\
-	gradient-constant-alpha-ps-rgb24-ref.png	\
+	gradient-constant-alpha-ps2-ref.png		\
+	gradient-constant-alpha-ps3-ref.png		\
+	gradient-constant-alpha-ps2-rgb24-ref.png	\
+	gradient-constant-alpha-ps3-rgb24-ref.png	\
 	gradient-constant-alpha-ref.png	\
 	gradient-constant-alpha-rgb24-ref.png	\
 	gradient-zero-stops-ref.png	\
@@ -487,35 +537,42 @@ REFERENCE_IMAGES = \
 	group-paint-ref.png	\
 	image-surface-source-ref.png \
 	infinite-join-ref.png	\
-	infinite-join-ps-ref.png	\
+	infinite-join-ps2-ref.png	\
+	infinite-join-ps3-ref.png	\
 	large-clip-ref.png	\
 	large-font-ref.png	\
 	large-source-ref.png	\
-	leaky-dash-ps-argb32-ref.png	\
-	leaky-dash-ps-rgb24-ref.png	\
+	leaky-dash-ps2-argb32-ref.png	\
+	leaky-dash-ps3-argb32-ref.png	\
+	leaky-dash-ps2-rgb24-ref.png	\
+	leaky-dash-ps3-rgb24-ref.png	\
 	leaky-dash-quartz-ref.png	\
 	leaky-dash-ref.png	\
 	leaky-dashed-rectangle-ref.png		\
-	leaky-dashed-rectangle-ps-ref.png	\
+	leaky-dashed-rectangle-ps2-ref.png	\
+	leaky-dashed-rectangle-ps3-ref.png	\
 	leaky-polygon-ref.png	\
-	leaky-polygon-ps-ref.png	\
+	leaky-polygon-ps2-ref.png	\
+	leaky-polygon-ps3-ref.png	\
 	linear-gradient-reflect-ref.png	\
 	linear-gradient-reflect-pdf-argb32-ref.png	\
 	linear-gradient-reflect-pdf-rgb24-ref.png	\
-	linear-gradient-reflect-ps-ref.png	\
+	linear-gradient-reflect-ps3-ref.png	\
 	linear-gradient-reflect-quartz-ref.png	\
 	linear-gradient-pdf-ref.png	\
-	linear-gradient-ps-ref.png	\
+	linear-gradient-ps3-ref.png	\
 	linear-gradient-quartz-ref.png	\
 	linear-gradient-ref.png	\
 	linear-gradient-svg12-ref.png	\
 	linear-gradient-svg11-ref.png	\
 	line-width-ref.png	\
-	line-width-scale-ps-ref.png	\
+	line-width-scale-ps2-ref.png	\
+	line-width-scale-ps3-ref.png	\
 	line-width-scale-quartz-ref.png	\
 	line-width-scale-ref.png	\
 	long-dashed-lines-ref.png	\
-	long-dashed-lines-ps-ref.png	\
+	long-dashed-lines-ps2-ref.png	\
+	long-dashed-lines-ps3-ref.png	\
 	long-dashed-lines-quartz-ref.png	\
 	long-lines-ref.png	\
 	mask-alpha-ref.png	\
@@ -545,16 +602,20 @@ REFERENCE_IMAGES = \
 	meta-surface-pattern-rgb24-ref.png	\
 	meta-surface-pattern-pdf-ref.png	\
 	meta-surface-pattern-pdf-rgb24-ref.png	\
-	meta-surface-pattern-ps-argb32-ref.png	\
-	meta-surface-pattern-ps-rgb24-ref.png	\
+	meta-surface-pattern-ps2-argb32-ref.png	\
+	meta-surface-pattern-ps3-rgb24-ref.png	\
+	meta-surface-pattern-ps2-argb32-ref.png	\
+	meta-surface-pattern-ps3-rgb24-ref.png	\
 	meta-surface-pattern-quartz-ref.png	\
 	meta-surface-pattern-quartz-rgb24-ref.png	\
 	meta-surface-pattern-svg-argb32-ref.png	\
 	meta-surface-pattern-svg-rgb24-ref.png	\
 	miter-precision-ref.png \
 	move-to-show-surface-ref.png	\
-	new-sub-path-ps-argb32-ref.png	\
-	new-sub-path-ps-rgb24-ref.png	\
+	new-sub-path-ps2-argb32-ref.png	\
+	new-sub-path-ps3-argb32-ref.png	\
+	new-sub-path-ps2-rgb24-ref.png	\
+	new-sub-path-ps3-rgb24-ref.png	\
 	new-sub-path-quartz-ref.png	\
 	new-sub-path-quartz-rgb24-ref.png	\
 	new-sub-path-ref.png	\
@@ -577,21 +638,26 @@ REFERENCE_IMAGES = \
 	operator-source-rgb24-ref.png	\
 	operator-source-quartz-ref.png \
 	operator-source-quartz-rgb24-ref.png \
-	over-above-source-ps-argb32-ref.png       \
+	over-above-source-ps2-argb32-ref.png       \
+	over-above-source-ps3-argb32-ref.png       \
 	over-above-source-quartz-ref.png	  \
 	over-above-source-quartz-rgb24-ref.png	  \
 	over-above-source-ref.png                 \
 	over-above-source-rgb24-ref.png           \
-	over-around-source-ps-argb32-ref.png       \
-	over-around-source-ps-rgb24-ref.png        \
+	over-around-source-ps2-argb32-ref.png       \
+	over-around-source-ps3-argb32-ref.png       \
+	over-around-source-ps2-rgb24-ref.png        \
+	over-around-source-ps3-rgb24-ref.png        \
 	over-around-source-quartz-ref.png	   \
 	over-around-source-quartz-rgb24-ref.png	   \
 	over-around-source-ref.png                 \
 	over-around-source-rgb24-ref.png           \
-	over-below-source-ps-argb32-ref.png       \
+	over-below-source-ps2-argb32-ref.png       \
+	over-below-source-ps3-argb32-ref.png       \
 	over-below-source-ref.png                 \
 	over-below-source-rgb24-ref.png           \
-	over-between-source-ps-argb32-ref.png     \
+	over-between-source-ps2-argb32-ref.png     \
+	over-between-source-ps3-argb32-ref.png     \
 	over-between-source-quartz-ref.png        \
 	over-between-source-quartz-rgb24-ref.png  \
 	over-between-source-ref.png                 \
@@ -623,24 +689,29 @@ REFERENCE_IMAGES = \
 	radial-gradient-svg12-ref.png	\
 	radial-gradient-svg11-ref.png	\
 	random-intersections-ref.png	\
-	random-intersections-ps-ref.png \
+	random-intersections-ps2-ref.png \
+	random-intersections-ps3-ref.png \
 	random-intersections-quartz-ref.png \
 	rgb24-ignore-alpha-ref.png \
 	rectangle-rounding-error-ref.png	\
 	rectilinear-fill-ref.png	\
 	rectilinear-miter-limit-ref.png		\
-	rectilinear-miter-limit-ps-ref.png	\
+	rectilinear-miter-limit-ps2-ref.png	\
+	rectilinear-miter-limit-ps3-ref.png	\
 	rectilinear-stroke-ref.png	\
 	reflected-stroke-ref.png	\
-	reflected-stroke-ps-ref.png	\
+	reflected-stroke-ps2-ref.png	\
+	reflected-stroke-ps3-ref.png	\
 	reflected-stroke-quartz-ref.png	\
 	rel-path-quartz-ref.png	\
 	rel-path-quartz-rgb24-ref.png	\
-	rel-path-ps-rgb24-ref.png	\
+	rel-path-ps2-rgb24-ref.png	\
+	rel-path-ps3-rgb24-ref.png	\
 	rel-path-ref.png	\
 	rel-path-rgb24-ref.png	\
 	rotate-image-surface-paint-pdf-rgb24-ref.png \
-	rotate-image-surface-paint-ps-ref.png \
+	rotate-image-surface-paint-ps2-ref.png \
+	rotate-image-surface-paint-ps3-ref.png \
 	rotate-image-surface-paint-pdf-argb32-ref.png	\
 	rotate-image-surface-paint-quartz-ref.png	\
 	rotate-image-surface-paint-ref.png	\
@@ -656,10 +727,12 @@ REFERENCE_IMAGES = \
 	stroke-ctm-caps-ref.png \
 	stroke-ctm-caps-quartz-ref.png \
 	select-font-face-ref.png	\
-	select-font-face-ps-ref.png \
+	select-font-face-ps2-ref.png \
+	select-font-face-ps3-ref.png \
 	select-font-face-quartz-ref.png \
 	self-copy-ref.png	\
-	self-copy-ps-ref.png	\
+	self-copy-ps2-ref.png	\
+	self-copy-ps3-ref.png	\
 	self-copy-overlap-ref.png	\
 	self-copy-overlap-rgb24-ref.png	\
 	self-intersecting-ref.png	\
@@ -669,13 +742,16 @@ REFERENCE_IMAGES = \
 	set-source-svg-argb32-ref.png	\
 	show-glyphs-many-ref.png	\
 	show-text-current-point-ref.png	\
-	show-text-current-point-ps-ref.png \
+	show-text-current-point-ps2-ref.png \
+	show-text-current-point-ps3-ref.png \
 	show-text-current-point-quartz-ref.png \
 	skew-extreme-ref.png \
-	skew-extreme-ps-ref.png \
+	skew-extreme-ps2-ref.png \
+	skew-extreme-ps3-ref.png \
 	smask-ref.png			\
 	smask-pdf-ref.png		\
-	smask-ps-ref.png		\
+	smask-ps2-ref.png		\
+	smask-ps3-ref.png		\
 	smask-svg12-ref.png		\
 	smask-svg11-ref.png		\
 	smask-fill-ref.png		\
@@ -696,35 +772,43 @@ REFERENCE_IMAGES = \
 	smask-stroke-pdf-ref.png	\
 	smask-text-ref.png		\
 	smask-text-pdf-ref.png		\
-	smask-text-ps-ref.png		\
+	smask-text-ps2-ref.png		\
+	smask-text-ps3-ref.png		\
 	smask-text-svg12-ref.png	\
 	smask-text-svg11-ref.png	\
 	stroke-image-ref.png \
 	stroke-image-pdf-ref.png \
-	stroke-image-ps-ref.png \
+	stroke-image-ps2-ref.png \
+	stroke-image-ps3-ref.png \
 	stroke-image-quartz-ref.png \
 	solid-pattern-cache-stress-ref.png	\
 	source-clip-ref.png	\
 	source-clip-scale-quartz-ref.png	\
-	source-clip-scale-ps-argb32-ref.png	\
-	source-clip-scale-ps-rgb24-ref.png	\
+	source-clip-scale-ps2-argb32-ref.png	\
+	source-clip-scale-ps3-argb32-ref.png	\
+	source-clip-scale-ps2-rgb24-ref.png	\
+	source-clip-scale-ps3-rgb24-ref.png	\
 	source-clip-scale-ref.png	\
 	source-clip-scale-svg12-ref.png	\
 	source-clip-scale-svg11-ref.png	\
 	source-clip-scale-pdf-ref.png \
 	source-surface-scale-paint-ref.png	\
 	source-surface-scale-paint-rgb24-ref.png	\
-	stroke-ctm-caps-ps-ref.png \
+	stroke-ctm-caps-ps2-ref.png \
+	stroke-ctm-caps-ps3-ref.png \
 	surface-pattern-big-scale-down-ref.png	\
 	surface-pattern-pdf-argb32-ref.png	\
-	surface-pattern-ps-argb32-ref.png	\
+	surface-pattern-ps2-argb32-ref.png	\
+	surface-pattern-ps3-argb32-ref.png	\
 	surface-pattern-ref.png	\
 	surface-pattern-scale-down-pdf-argb32-ref.png	\
-	surface-pattern-scale-down-ps-argb32-ref.png	\
+	surface-pattern-scale-down-ps2-argb32-ref.png	\
+	surface-pattern-scale-down-ps3-argb32-ref.png	\
 	surface-pattern-scale-down-ref.png	\
 	surface-pattern-scale-down-quartz-ref.png	\
 	surface-pattern-scale-up-pdf-argb32-ref.png	\
-	surface-pattern-scale-up-ps-argb32-ref.png	\
+	surface-pattern-scale-up-ps2-argb32-ref.png	\
+	surface-pattern-scale-up-ps3-argb32-ref.png	\
 	surface-pattern-scale-up-ref.png	\
 	surface-pattern-svg12-ref.png	\
 	surface-pattern-svg11-ref.png	\
@@ -737,8 +821,8 @@ REFERENCE_IMAGES = \
 	text-antialias-subpixel-quartz-ref.png	\
 	text-glyph-range-ref.png	\
 	text-glyph-range-rgb24-ref.png	\
-	text-pattern-ps-argb32-ref.png	\
-	text-pattern-ps-rgb24-ref.png	\
+	text-pattern-ps3-argb32-ref.png	\
+	text-pattern-ps3-rgb24-ref.png	\
 	text-pattern-ref.png	\
 	text-pattern-rgb24-ref.png	\
 	text-pattern-svg-argb32-ref.png	\
@@ -749,20 +833,25 @@ REFERENCE_IMAGES = \
 	text-pattern-quartz-rgb24-ref.png \
 	text-rotate-ref.png	\
 	text-rotate-pdf-ref.png \
-	text-rotate-ps-ref.png	\
+	text-rotate-ps2-ref.png	\
+	text-rotate-ps3-ref.png	\
 	text-rotate-svg12-ref.png \
 	text-rotate-svg11-ref.png \
 	text-rotate-quartz-ref.png \
 	text-transform-ref.png		\
 	text-transform-pdf-ref.png	\
-	text-transform-ps-ref.png	\
+	text-transform-ps2-ref.png	\
+	text-transform-ps3-ref.png	\
 	transforms-ref.png	\
-	transforms-ps-ref.png	\
+	transforms-ps2-ref.png	\
+	transforms-ps3-ref.png	\
 	translate-show-surface-ref.png	\
 	trap-clip-quartz-ref.png	\
 	trap-clip-quartz-rgb24-ref.png	\
-	trap-clip-ps-argb32-ref.png	\
-	trap-clip-ps-rgb24-ref.png	\
+	trap-clip-ps2-argb32-ref.png	\
+	trap-clip-ps3-argb32-ref.png	\
+	trap-clip-ps2-rgb24-ref.png	\
+	trap-clip-ps3-rgb24-ref.png	\
 	trap-clip-ref.png	\
 	trap-clip-rgb24-ref.png	\
 	trap-clip-pdf-argb32-ref.png \
@@ -772,16 +861,19 @@ REFERENCE_IMAGES = \
 	unbounded-operator-ref.png	\
 	unbounded-operator-rgb24-ref.png	\
 	user-font-ref.png	\
-	user-font-ps-ref.png \
+	user-font-ps2-ref.png \
+	user-font-ps3-ref.png \
 	user-font-svg12-ref.png	\
 	user-font-svg11-ref.png	\
 	user-font-proxy-ref.png	\
 	user-font-proxy-pdf-ref.png	\
-	user-font-proxy-ps-ref.png	\
+	user-font-proxy-ps2-ref.png	\
+	user-font-proxy-ps3-ref.png	\
 	user-font-proxy-svg12-ref.png	\
 	user-font-proxy-svg11-ref.png	\
 	user-font-rescale-ref.png	\
-	user-font-rescale-ps-ref.png	\
+	user-font-rescale-ps2-ref.png	\
+	user-font-rescale-ps3-ref.png	\
 	user-font-rescale-svg12-ref.png	\
 	user-font-rescale-svg11-ref.png	\
 	unbounded-operator-quartz-ref.png	\
diff --git a/test/big-line-ps-ref.png b/test/big-line-ps-ref.png
deleted file mode 100644
index 2a4f57c..0000000
Binary files a/test/big-line-ps-ref.png and /dev/null differ
diff --git a/test/big-line-ps-rgb24-ref.png b/test/big-line-ps-rgb24-ref.png
deleted file mode 100644
index d3d2356..0000000
Binary files a/test/big-line-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/big-line-ps2-ref.png b/test/big-line-ps2-ref.png
new file mode 100644
index 0000000..2a4f57c
Binary files /dev/null and b/test/big-line-ps2-ref.png differ
diff --git a/test/big-line-ps2-rgb24-ref.png b/test/big-line-ps2-rgb24-ref.png
new file mode 100644
index 0000000..d3d2356
Binary files /dev/null and b/test/big-line-ps2-rgb24-ref.png differ
diff --git a/test/big-line-ps3-ref.png b/test/big-line-ps3-ref.png
new file mode 100644
index 0000000..2a4f57c
Binary files /dev/null and b/test/big-line-ps3-ref.png differ
diff --git a/test/big-line-ps3-rgb24-ref.png b/test/big-line-ps3-rgb24-ref.png
new file mode 100644
index 0000000..d3d2356
Binary files /dev/null and b/test/big-line-ps3-rgb24-ref.png differ
diff --git a/test/caps-joins-ps-ref.png b/test/caps-joins-ps-ref.png
deleted file mode 100644
index 1d473ac..0000000
Binary files a/test/caps-joins-ps-ref.png and /dev/null differ
diff --git a/test/caps-joins-ps2-ref.png b/test/caps-joins-ps2-ref.png
new file mode 100644
index 0000000..1d473ac
Binary files /dev/null and b/test/caps-joins-ps2-ref.png differ
diff --git a/test/caps-joins-ps3-ref.png b/test/caps-joins-ps3-ref.png
new file mode 100644
index 0000000..1d473ac
Binary files /dev/null and b/test/caps-joins-ps3-ref.png differ
diff --git a/test/clip-fill-rule-ps-argb32-ref.png b/test/clip-fill-rule-ps-argb32-ref.png
deleted file mode 100644
index 67a8988..0000000
Binary files a/test/clip-fill-rule-ps-argb32-ref.png and /dev/null differ
diff --git a/test/clip-fill-rule-ps-rgb24-ref.png b/test/clip-fill-rule-ps-rgb24-ref.png
deleted file mode 100644
index 0697a42..0000000
Binary files a/test/clip-fill-rule-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/clip-fill-rule-ps2-argb32-ref.png b/test/clip-fill-rule-ps2-argb32-ref.png
new file mode 100644
index 0000000..67a8988
Binary files /dev/null and b/test/clip-fill-rule-ps2-argb32-ref.png differ
diff --git a/test/clip-fill-rule-ps2-rgb24-ref.png b/test/clip-fill-rule-ps2-rgb24-ref.png
new file mode 100644
index 0000000..0697a42
Binary files /dev/null and b/test/clip-fill-rule-ps2-rgb24-ref.png differ
diff --git a/test/clip-fill-rule-ps3-argb32-ref.png b/test/clip-fill-rule-ps3-argb32-ref.png
new file mode 100644
index 0000000..67a8988
Binary files /dev/null and b/test/clip-fill-rule-ps3-argb32-ref.png differ
diff --git a/test/clip-fill-rule-ps3-rgb24-ref.png b/test/clip-fill-rule-ps3-rgb24-ref.png
new file mode 100644
index 0000000..0697a42
Binary files /dev/null and b/test/clip-fill-rule-ps3-rgb24-ref.png differ
diff --git a/test/clip-nesting-ps-argb32-ref.png b/test/clip-nesting-ps-argb32-ref.png
deleted file mode 100644
index 41f7160..0000000
Binary files a/test/clip-nesting-ps-argb32-ref.png and /dev/null differ
diff --git a/test/clip-nesting-ps-rgb24-ref.png b/test/clip-nesting-ps-rgb24-ref.png
deleted file mode 100644
index 8238deb..0000000
Binary files a/test/clip-nesting-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/clip-nesting-ps2-argb32-ref.png b/test/clip-nesting-ps2-argb32-ref.png
new file mode 100644
index 0000000..41f7160
Binary files /dev/null and b/test/clip-nesting-ps2-argb32-ref.png differ
diff --git a/test/clip-nesting-ps2-rgb24-ref.png b/test/clip-nesting-ps2-rgb24-ref.png
new file mode 100644
index 0000000..8238deb
Binary files /dev/null and b/test/clip-nesting-ps2-rgb24-ref.png differ
diff --git a/test/clip-nesting-ps3-argb32-ref.png b/test/clip-nesting-ps3-argb32-ref.png
new file mode 100644
index 0000000..41f7160
Binary files /dev/null and b/test/clip-nesting-ps3-argb32-ref.png differ
diff --git a/test/clip-nesting-ps3-rgb24-ref.png b/test/clip-nesting-ps3-rgb24-ref.png
new file mode 100644
index 0000000..8238deb
Binary files /dev/null and b/test/clip-nesting-ps3-rgb24-ref.png differ
diff --git a/test/clip-operator-ps-rgb24-ref.png b/test/clip-operator-ps-rgb24-ref.png
deleted file mode 100644
index 6ed9fc4..0000000
Binary files a/test/clip-operator-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/clip-operator-ps2-rgb24-ref.png b/test/clip-operator-ps2-rgb24-ref.png
new file mode 100644
index 0000000..6ed9fc4
Binary files /dev/null and b/test/clip-operator-ps2-rgb24-ref.png differ
diff --git a/test/clip-operator-ps3-ref.png b/test/clip-operator-ps3-ref.png
new file mode 100644
index 0000000..dee12ca
Binary files /dev/null and b/test/clip-operator-ps3-ref.png differ
diff --git a/test/clip-operator-ps3-rgb24-ref.png b/test/clip-operator-ps3-rgb24-ref.png
new file mode 100644
index 0000000..6ed9fc4
Binary files /dev/null and b/test/clip-operator-ps3-rgb24-ref.png differ
diff --git a/test/clip-push-group-ps-argb32-ref.png b/test/clip-push-group-ps-argb32-ref.png
deleted file mode 100644
index 31b3284..0000000
Binary files a/test/clip-push-group-ps-argb32-ref.png and /dev/null differ
diff --git a/test/clip-push-group-ps-rgb24-ref.png b/test/clip-push-group-ps-rgb24-ref.png
deleted file mode 100644
index 31b3284..0000000
Binary files a/test/clip-push-group-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/clip-push-group-ps2-argb32-ref.png b/test/clip-push-group-ps2-argb32-ref.png
new file mode 100644
index 0000000..31b3284
Binary files /dev/null and b/test/clip-push-group-ps2-argb32-ref.png differ
diff --git a/test/clip-push-group-ps2-rgb24-ref.png b/test/clip-push-group-ps2-rgb24-ref.png
new file mode 100644
index 0000000..31b3284
Binary files /dev/null and b/test/clip-push-group-ps2-rgb24-ref.png differ
diff --git a/test/clip-push-group-ps3-argb32-ref.png b/test/clip-push-group-ps3-argb32-ref.png
new file mode 100644
index 0000000..31b3284
Binary files /dev/null and b/test/clip-push-group-ps3-argb32-ref.png differ
diff --git a/test/clip-push-group-ps3-rgb24-ref.png b/test/clip-push-group-ps3-rgb24-ref.png
new file mode 100644
index 0000000..31b3284
Binary files /dev/null and b/test/clip-push-group-ps3-rgb24-ref.png differ
diff --git a/test/clip-twice-ps-argb32-ref.png b/test/clip-twice-ps-argb32-ref.png
deleted file mode 100644
index 0cb6186..0000000
Binary files a/test/clip-twice-ps-argb32-ref.png and /dev/null differ
diff --git a/test/clip-twice-ps-rgb24-ref.png b/test/clip-twice-ps-rgb24-ref.png
deleted file mode 100644
index 8a121c4..0000000
Binary files a/test/clip-twice-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/clip-twice-ps2-argb32-ref.png b/test/clip-twice-ps2-argb32-ref.png
new file mode 100644
index 0000000..0cb6186
Binary files /dev/null and b/test/clip-twice-ps2-argb32-ref.png differ
diff --git a/test/clip-twice-ps2-rgb24-ref.png b/test/clip-twice-ps2-rgb24-ref.png
new file mode 100644
index 0000000..8a121c4
Binary files /dev/null and b/test/clip-twice-ps2-rgb24-ref.png differ
diff --git a/test/clip-twice-ps3-argb32-ref.png b/test/clip-twice-ps3-argb32-ref.png
new file mode 100644
index 0000000..0cb6186
Binary files /dev/null and b/test/clip-twice-ps3-argb32-ref.png differ
diff --git a/test/clip-twice-ps3-rgb24-ref.png b/test/clip-twice-ps3-rgb24-ref.png
new file mode 100644
index 0000000..8a121c4
Binary files /dev/null and b/test/clip-twice-ps3-rgb24-ref.png differ
diff --git a/test/clipped-group-ps-ref.png b/test/clipped-group-ps-ref.png
deleted file mode 100644
index 6ce3670..0000000
Binary files a/test/clipped-group-ps-ref.png and /dev/null differ
diff --git a/test/clipped-group-ps2-ref.png b/test/clipped-group-ps2-ref.png
new file mode 100644
index 0000000..6ce3670
Binary files /dev/null and b/test/clipped-group-ps2-ref.png differ
diff --git a/test/clipped-group-ps3-ref.png b/test/clipped-group-ps3-ref.png
new file mode 100644
index 0000000..6ce3670
Binary files /dev/null and b/test/clipped-group-ps3-ref.png differ
diff --git a/test/close-path-ps-ref.png b/test/close-path-ps-ref.png
deleted file mode 100644
index e43821c..0000000
Binary files a/test/close-path-ps-ref.png and /dev/null differ
diff --git a/test/close-path-ps2-ref.png b/test/close-path-ps2-ref.png
new file mode 100644
index 0000000..e43821c
Binary files /dev/null and b/test/close-path-ps2-ref.png differ
diff --git a/test/close-path-ps3-ref.png b/test/close-path-ps3-ref.png
new file mode 100644
index 0000000..e43821c
Binary files /dev/null and b/test/close-path-ps3-ref.png differ
diff --git a/test/copy-path-ps-ref.png b/test/copy-path-ps-ref.png
deleted file mode 100644
index f66015b..0000000
Binary files a/test/copy-path-ps-ref.png and /dev/null differ
diff --git a/test/copy-path-ps2-ref.png b/test/copy-path-ps2-ref.png
new file mode 100644
index 0000000..f66015b
Binary files /dev/null and b/test/copy-path-ps2-ref.png differ
diff --git a/test/copy-path-ps3-ref.png b/test/copy-path-ps3-ref.png
new file mode 100644
index 0000000..f66015b
Binary files /dev/null and b/test/copy-path-ps3-ref.png differ
diff --git a/test/dash-caps-joins-ps-argb32-ref.png b/test/dash-caps-joins-ps-argb32-ref.png
deleted file mode 100644
index baadcb4..0000000
Binary files a/test/dash-caps-joins-ps-argb32-ref.png and /dev/null differ
diff --git a/test/dash-caps-joins-ps-rgb24-ref.png b/test/dash-caps-joins-ps-rgb24-ref.png
deleted file mode 100644
index baadcb4..0000000
Binary files a/test/dash-caps-joins-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/dash-caps-joins-ps2-argb32-ref.png b/test/dash-caps-joins-ps2-argb32-ref.png
new file mode 100644
index 0000000..baadcb4
Binary files /dev/null and b/test/dash-caps-joins-ps2-argb32-ref.png differ
diff --git a/test/dash-caps-joins-ps2-rgb24-ref.png b/test/dash-caps-joins-ps2-rgb24-ref.png
new file mode 100644
index 0000000..baadcb4
Binary files /dev/null and b/test/dash-caps-joins-ps2-rgb24-ref.png differ
diff --git a/test/dash-caps-joins-ps3-argb32-ref.png b/test/dash-caps-joins-ps3-argb32-ref.png
new file mode 100644
index 0000000..baadcb4
Binary files /dev/null and b/test/dash-caps-joins-ps3-argb32-ref.png differ
diff --git a/test/dash-caps-joins-ps3-rgb24-ref.png b/test/dash-caps-joins-ps3-rgb24-ref.png
new file mode 100644
index 0000000..baadcb4
Binary files /dev/null and b/test/dash-caps-joins-ps3-rgb24-ref.png differ
diff --git a/test/dash-curve-ps-ref.png b/test/dash-curve-ps-ref.png
deleted file mode 100644
index 25a768b..0000000
Binary files a/test/dash-curve-ps-ref.png and /dev/null differ
diff --git a/test/dash-curve-ps2-ref.png b/test/dash-curve-ps2-ref.png
new file mode 100644
index 0000000..25a768b
Binary files /dev/null and b/test/dash-curve-ps2-ref.png differ
diff --git a/test/dash-curve-ps3-ref.png b/test/dash-curve-ps3-ref.png
new file mode 100644
index 0000000..25a768b
Binary files /dev/null and b/test/dash-curve-ps3-ref.png differ
diff --git a/test/dash-scale-ps-argb32-ref.png b/test/dash-scale-ps-argb32-ref.png
deleted file mode 100644
index efe8b11..0000000
Binary files a/test/dash-scale-ps-argb32-ref.png and /dev/null differ
diff --git a/test/dash-scale-ps-rgb24-ref.png b/test/dash-scale-ps-rgb24-ref.png
deleted file mode 100644
index 5a92f55..0000000
Binary files a/test/dash-scale-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/dash-scale-ps2-argb32-ref.png b/test/dash-scale-ps2-argb32-ref.png
new file mode 100644
index 0000000..efe8b11
Binary files /dev/null and b/test/dash-scale-ps2-argb32-ref.png differ
diff --git a/test/dash-scale-ps2-rgb24-ref.png b/test/dash-scale-ps2-rgb24-ref.png
new file mode 100644
index 0000000..5a92f55
Binary files /dev/null and b/test/dash-scale-ps2-rgb24-ref.png differ
diff --git a/test/dash-scale-ps3-argb32-ref.png b/test/dash-scale-ps3-argb32-ref.png
new file mode 100644
index 0000000..efe8b11
Binary files /dev/null and b/test/dash-scale-ps3-argb32-ref.png differ
diff --git a/test/dash-scale-ps3-rgb24-ref.png b/test/dash-scale-ps3-rgb24-ref.png
new file mode 100644
index 0000000..5a92f55
Binary files /dev/null and b/test/dash-scale-ps3-rgb24-ref.png differ
diff --git a/test/dash-state-ps-ref.png b/test/dash-state-ps-ref.png
deleted file mode 100644
index ec6904e..0000000
Binary files a/test/dash-state-ps-ref.png and /dev/null differ
diff --git a/test/dash-state-ps2-ref.png b/test/dash-state-ps2-ref.png
new file mode 100644
index 0000000..ec6904e
Binary files /dev/null and b/test/dash-state-ps2-ref.png differ
diff --git a/test/dash-state-ps3-ref.png b/test/dash-state-ps3-ref.png
new file mode 100644
index 0000000..ec6904e
Binary files /dev/null and b/test/dash-state-ps3-ref.png differ
diff --git a/test/dash-zero-length-ps-ref.png b/test/dash-zero-length-ps-ref.png
deleted file mode 100644
index 68fd3fb..0000000
Binary files a/test/dash-zero-length-ps-ref.png and /dev/null differ
diff --git a/test/dash-zero-length-ps-rgb24-ref.png b/test/dash-zero-length-ps-rgb24-ref.png
deleted file mode 100644
index 8a4a40f..0000000
Binary files a/test/dash-zero-length-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/dash-zero-length-ps2-ref.png b/test/dash-zero-length-ps2-ref.png
new file mode 100644
index 0000000..68fd3fb
Binary files /dev/null and b/test/dash-zero-length-ps2-ref.png differ
diff --git a/test/dash-zero-length-ps2-rgb24-ref.png b/test/dash-zero-length-ps2-rgb24-ref.png
new file mode 100644
index 0000000..8a4a40f
Binary files /dev/null and b/test/dash-zero-length-ps2-rgb24-ref.png differ
diff --git a/test/dash-zero-length-ps3-ref.png b/test/dash-zero-length-ps3-ref.png
new file mode 100644
index 0000000..68fd3fb
Binary files /dev/null and b/test/dash-zero-length-ps3-ref.png differ
diff --git a/test/dash-zero-length-ps3-rgb24-ref.png b/test/dash-zero-length-ps3-rgb24-ref.png
new file mode 100644
index 0000000..8a4a40f
Binary files /dev/null and b/test/dash-zero-length-ps3-rgb24-ref.png differ
diff --git a/test/degenerate-arc-ps-ref.png b/test/degenerate-arc-ps-ref.png
deleted file mode 100644
index 3cbf4da..0000000
Binary files a/test/degenerate-arc-ps-ref.png and /dev/null differ
diff --git a/test/degenerate-arc-ps2-ref.png b/test/degenerate-arc-ps2-ref.png
new file mode 100644
index 0000000..3cbf4da
Binary files /dev/null and b/test/degenerate-arc-ps2-ref.png differ
diff --git a/test/degenerate-arc-ps3-ref.png b/test/degenerate-arc-ps3-ref.png
new file mode 100644
index 0000000..3cbf4da
Binary files /dev/null and b/test/degenerate-arc-ps3-ref.png differ
diff --git a/test/degenerate-path-ps-argb32-ref.png b/test/degenerate-path-ps-argb32-ref.png
deleted file mode 100644
index 85b9d4b..0000000
Binary files a/test/degenerate-path-ps-argb32-ref.png and /dev/null differ
diff --git a/test/degenerate-path-ps-rgb24-ref.png b/test/degenerate-path-ps-rgb24-ref.png
deleted file mode 100644
index 99e6c66..0000000
Binary files a/test/degenerate-path-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/degenerate-path-ps2-argb32-ref.png b/test/degenerate-path-ps2-argb32-ref.png
new file mode 100644
index 0000000..85b9d4b
Binary files /dev/null and b/test/degenerate-path-ps2-argb32-ref.png differ
diff --git a/test/degenerate-path-ps2-rgb24-ref.png b/test/degenerate-path-ps2-rgb24-ref.png
new file mode 100644
index 0000000..99e6c66
Binary files /dev/null and b/test/degenerate-path-ps2-rgb24-ref.png differ
diff --git a/test/degenerate-path-ps3-argb32-ref.png b/test/degenerate-path-ps3-argb32-ref.png
new file mode 100644
index 0000000..85b9d4b
Binary files /dev/null and b/test/degenerate-path-ps3-argb32-ref.png differ
diff --git a/test/degenerate-path-ps3-rgb24-ref.png b/test/degenerate-path-ps3-rgb24-ref.png
new file mode 100644
index 0000000..99e6c66
Binary files /dev/null and b/test/degenerate-path-ps3-rgb24-ref.png differ
diff --git a/test/degenerate-pen-ps-ref.png b/test/degenerate-pen-ps-ref.png
deleted file mode 100644
index 2d0f07b..0000000
Binary files a/test/degenerate-pen-ps-ref.png and /dev/null differ
diff --git a/test/degenerate-pen-ps2-ref.png b/test/degenerate-pen-ps2-ref.png
new file mode 100644
index 0000000..2d0f07b
Binary files /dev/null and b/test/degenerate-pen-ps2-ref.png differ
diff --git a/test/degenerate-pen-ps3-ref.png b/test/degenerate-pen-ps3-ref.png
new file mode 100644
index 0000000..2d0f07b
Binary files /dev/null and b/test/degenerate-pen-ps3-ref.png differ
diff --git a/test/device-offset-fractional-ps-ref.png b/test/device-offset-fractional-ps-ref.png
deleted file mode 100644
index 72b144c..0000000
Binary files a/test/device-offset-fractional-ps-ref.png and /dev/null differ
diff --git a/test/device-offset-fractional-ps2-ref.png b/test/device-offset-fractional-ps2-ref.png
new file mode 100644
index 0000000..72b144c
Binary files /dev/null and b/test/device-offset-fractional-ps2-ref.png differ
diff --git a/test/device-offset-fractional-ps3-ref.png b/test/device-offset-fractional-ps3-ref.png
new file mode 100644
index 0000000..72b144c
Binary files /dev/null and b/test/device-offset-fractional-ps3-ref.png differ
diff --git a/test/extend-reflect-ps-ref.png b/test/extend-reflect-ps-ref.png
deleted file mode 100644
index b33b38d..0000000
Binary files a/test/extend-reflect-ps-ref.png and /dev/null differ
diff --git a/test/extend-reflect-ps2-ref.png b/test/extend-reflect-ps2-ref.png
new file mode 100644
index 0000000..b33b38d
Binary files /dev/null and b/test/extend-reflect-ps2-ref.png differ
diff --git a/test/extend-reflect-ps3-ref.png b/test/extend-reflect-ps3-ref.png
new file mode 100644
index 0000000..b33b38d
Binary files /dev/null and b/test/extend-reflect-ps3-ref.png differ
diff --git a/test/extend-reflect-similar-ps-ref.png b/test/extend-reflect-similar-ps-ref.png
deleted file mode 100644
index b33b38d..0000000
Binary files a/test/extend-reflect-similar-ps-ref.png and /dev/null differ
diff --git a/test/extend-reflect-similar-ps2-ref.png b/test/extend-reflect-similar-ps2-ref.png
new file mode 100644
index 0000000..b33b38d
Binary files /dev/null and b/test/extend-reflect-similar-ps2-ref.png differ
diff --git a/test/extend-reflect-similar-ps3-ref.png b/test/extend-reflect-similar-ps3-ref.png
new file mode 100644
index 0000000..b33b38d
Binary files /dev/null and b/test/extend-reflect-similar-ps3-ref.png differ
diff --git a/test/fill-alpha-pattern-ps-ref.png b/test/fill-alpha-pattern-ps-ref.png
deleted file mode 100644
index c8d14b1..0000000
Binary files a/test/fill-alpha-pattern-ps-ref.png and /dev/null differ
diff --git a/test/fill-alpha-pattern-ps3-ref.png b/test/fill-alpha-pattern-ps3-ref.png
new file mode 100644
index 0000000..c8d14b1
Binary files /dev/null and b/test/fill-alpha-pattern-ps3-ref.png differ
diff --git a/test/fill-and-stroke-ps-argb32-ref.png b/test/fill-and-stroke-ps-argb32-ref.png
deleted file mode 100644
index 850f0cb..0000000
Binary files a/test/fill-and-stroke-ps-argb32-ref.png and /dev/null differ
diff --git a/test/fill-and-stroke-ps-rgb24-ref.png b/test/fill-and-stroke-ps-rgb24-ref.png
deleted file mode 100644
index 41e3991..0000000
Binary files a/test/fill-and-stroke-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/fill-and-stroke-ps2-argb32-ref.png b/test/fill-and-stroke-ps2-argb32-ref.png
new file mode 100644
index 0000000..850f0cb
Binary files /dev/null and b/test/fill-and-stroke-ps2-argb32-ref.png differ
diff --git a/test/fill-and-stroke-ps2-rgb24-ref.png b/test/fill-and-stroke-ps2-rgb24-ref.png
new file mode 100644
index 0000000..41e3991
Binary files /dev/null and b/test/fill-and-stroke-ps2-rgb24-ref.png differ
diff --git a/test/fill-and-stroke-ps3-argb32-ref.png b/test/fill-and-stroke-ps3-argb32-ref.png
new file mode 100644
index 0000000..850f0cb
Binary files /dev/null and b/test/fill-and-stroke-ps3-argb32-ref.png differ
diff --git a/test/fill-and-stroke-ps3-rgb24-ref.png b/test/fill-and-stroke-ps3-rgb24-ref.png
new file mode 100644
index 0000000..41e3991
Binary files /dev/null and b/test/fill-and-stroke-ps3-rgb24-ref.png differ
diff --git a/test/fill-missed-stop-ps-argb32-ref.png b/test/fill-missed-stop-ps-argb32-ref.png
deleted file mode 100644
index b94a708..0000000
Binary files a/test/fill-missed-stop-ps-argb32-ref.png and /dev/null differ
diff --git a/test/fill-missed-stop-ps-rgb24-ref.png b/test/fill-missed-stop-ps-rgb24-ref.png
deleted file mode 100644
index fd54c7b..0000000
Binary files a/test/fill-missed-stop-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/fill-missed-stop-ps2-argb32-ref.png b/test/fill-missed-stop-ps2-argb32-ref.png
new file mode 100644
index 0000000..b94a708
Binary files /dev/null and b/test/fill-missed-stop-ps2-argb32-ref.png differ
diff --git a/test/fill-missed-stop-ps2-rgb24-ref.png b/test/fill-missed-stop-ps2-rgb24-ref.png
new file mode 100644
index 0000000..fd54c7b
Binary files /dev/null and b/test/fill-missed-stop-ps2-rgb24-ref.png differ
diff --git a/test/fill-missed-stop-ps3-argb32-ref.png b/test/fill-missed-stop-ps3-argb32-ref.png
new file mode 100644
index 0000000..b94a708
Binary files /dev/null and b/test/fill-missed-stop-ps3-argb32-ref.png differ
diff --git a/test/fill-missed-stop-ps3-rgb24-ref.png b/test/fill-missed-stop-ps3-rgb24-ref.png
new file mode 100644
index 0000000..fd54c7b
Binary files /dev/null and b/test/fill-missed-stop-ps3-rgb24-ref.png differ
diff --git a/test/fill-rule-ps-argb32-ref.png b/test/fill-rule-ps-argb32-ref.png
deleted file mode 100644
index 971b560..0000000
Binary files a/test/fill-rule-ps-argb32-ref.png and /dev/null differ
diff --git a/test/fill-rule-ps-rgb24-ref.png b/test/fill-rule-ps-rgb24-ref.png
deleted file mode 100644
index 8e1efc2..0000000
Binary files a/test/fill-rule-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/fill-rule-ps2-argb32-ref.png b/test/fill-rule-ps2-argb32-ref.png
new file mode 100644
index 0000000..971b560
Binary files /dev/null and b/test/fill-rule-ps2-argb32-ref.png differ
diff --git a/test/fill-rule-ps2-rgb24-ref.png b/test/fill-rule-ps2-rgb24-ref.png
new file mode 100644
index 0000000..8e1efc2
Binary files /dev/null and b/test/fill-rule-ps2-rgb24-ref.png differ
diff --git a/test/fill-rule-ps3-argb32-ref.png b/test/fill-rule-ps3-argb32-ref.png
new file mode 100644
index 0000000..971b560
Binary files /dev/null and b/test/fill-rule-ps3-argb32-ref.png differ
diff --git a/test/fill-rule-ps3-rgb24-ref.png b/test/fill-rule-ps3-rgb24-ref.png
new file mode 100644
index 0000000..8e1efc2
Binary files /dev/null and b/test/fill-rule-ps3-rgb24-ref.png differ
diff --git a/test/finer-grained-fallbacks-ps-argb32-ref.png b/test/finer-grained-fallbacks-ps-argb32-ref.png
deleted file mode 100644
index 402f01b..0000000
Binary files a/test/finer-grained-fallbacks-ps-argb32-ref.png and /dev/null differ
diff --git a/test/finer-grained-fallbacks-ps-rgb24-ref.png b/test/finer-grained-fallbacks-ps-rgb24-ref.png
deleted file mode 100644
index e821344..0000000
Binary files a/test/finer-grained-fallbacks-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/finer-grained-fallbacks-ps2-argb32-ref.png b/test/finer-grained-fallbacks-ps2-argb32-ref.png
new file mode 100644
index 0000000..402f01b
Binary files /dev/null and b/test/finer-grained-fallbacks-ps2-argb32-ref.png differ
diff --git a/test/finer-grained-fallbacks-ps2-rgb24-ref.png b/test/finer-grained-fallbacks-ps2-rgb24-ref.png
new file mode 100644
index 0000000..e821344
Binary files /dev/null and b/test/finer-grained-fallbacks-ps2-rgb24-ref.png differ
diff --git a/test/finer-grained-fallbacks-ps3-argb32-ref.png b/test/finer-grained-fallbacks-ps3-argb32-ref.png
new file mode 100644
index 0000000..402f01b
Binary files /dev/null and b/test/finer-grained-fallbacks-ps3-argb32-ref.png differ
diff --git a/test/finer-grained-fallbacks-ps3-rgb24-ref.png b/test/finer-grained-fallbacks-ps3-rgb24-ref.png
new file mode 100644
index 0000000..e821344
Binary files /dev/null and b/test/finer-grained-fallbacks-ps3-rgb24-ref.png differ
diff --git a/test/font-matrix-translation-ps-argb32-ref.png b/test/font-matrix-translation-ps-argb32-ref.png
deleted file mode 100644
index 41d05a0..0000000
Binary files a/test/font-matrix-translation-ps-argb32-ref.png and /dev/null differ
diff --git a/test/font-matrix-translation-ps-rgb24-ref.png b/test/font-matrix-translation-ps-rgb24-ref.png
deleted file mode 100644
index 41d05a0..0000000
Binary files a/test/font-matrix-translation-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/font-matrix-translation-ps2-argb32-ref.png b/test/font-matrix-translation-ps2-argb32-ref.png
new file mode 100644
index 0000000..41d05a0
Binary files /dev/null and b/test/font-matrix-translation-ps2-argb32-ref.png differ
diff --git a/test/font-matrix-translation-ps2-rgb24-ref.png b/test/font-matrix-translation-ps2-rgb24-ref.png
new file mode 100644
index 0000000..41d05a0
Binary files /dev/null and b/test/font-matrix-translation-ps2-rgb24-ref.png differ
diff --git a/test/font-matrix-translation-ps3-argb32-ref.png b/test/font-matrix-translation-ps3-argb32-ref.png
new file mode 100644
index 0000000..41d05a0
Binary files /dev/null and b/test/font-matrix-translation-ps3-argb32-ref.png differ
diff --git a/test/font-matrix-translation-ps3-rgb24-ref.png b/test/font-matrix-translation-ps3-rgb24-ref.png
new file mode 100644
index 0000000..41d05a0
Binary files /dev/null and b/test/font-matrix-translation-ps3-rgb24-ref.png differ
diff --git a/test/ft-show-glyphs-positioning-ps-ref.png b/test/ft-show-glyphs-positioning-ps-ref.png
deleted file mode 100644
index c5fbf30..0000000
Binary files a/test/ft-show-glyphs-positioning-ps-ref.png and /dev/null differ
diff --git a/test/ft-show-glyphs-positioning-ps2-ref.png b/test/ft-show-glyphs-positioning-ps2-ref.png
new file mode 100644
index 0000000..c5fbf30
Binary files /dev/null and b/test/ft-show-glyphs-positioning-ps2-ref.png differ
diff --git a/test/ft-show-glyphs-positioning-ps3-ref.png b/test/ft-show-glyphs-positioning-ps3-ref.png
new file mode 100644
index 0000000..c5fbf30
Binary files /dev/null and b/test/ft-show-glyphs-positioning-ps3-ref.png differ
diff --git a/test/ft-show-glyphs-table-ps-ref.png b/test/ft-show-glyphs-table-ps-ref.png
deleted file mode 100644
index 5143663..0000000
Binary files a/test/ft-show-glyphs-table-ps-ref.png and /dev/null differ
diff --git a/test/ft-show-glyphs-table-ps2-ref.png b/test/ft-show-glyphs-table-ps2-ref.png
new file mode 100644
index 0000000..5143663
Binary files /dev/null and b/test/ft-show-glyphs-table-ps2-ref.png differ
diff --git a/test/ft-show-glyphs-table-ps3-ref.png b/test/ft-show-glyphs-table-ps3-ref.png
new file mode 100644
index 0000000..5143663
Binary files /dev/null and b/test/ft-show-glyphs-table-ps3-ref.png differ
diff --git a/test/ft-text-antialias-none-ps-argb32-ref.png b/test/ft-text-antialias-none-ps-argb32-ref.png
deleted file mode 100644
index 4f7ee83..0000000
Binary files a/test/ft-text-antialias-none-ps-argb32-ref.png and /dev/null differ
diff --git a/test/ft-text-antialias-none-ps2-argb32-ref.png b/test/ft-text-antialias-none-ps2-argb32-ref.png
new file mode 100644
index 0000000..4f7ee83
Binary files /dev/null and b/test/ft-text-antialias-none-ps2-argb32-ref.png differ
diff --git a/test/ft-text-antialias-none-ps3-argb32-ref.png b/test/ft-text-antialias-none-ps3-argb32-ref.png
new file mode 100644
index 0000000..4f7ee83
Binary files /dev/null and b/test/ft-text-antialias-none-ps3-argb32-ref.png differ
diff --git a/test/ft-text-vertical-layout-type1-ps-ref.png b/test/ft-text-vertical-layout-type1-ps-ref.png
deleted file mode 100644
index 4523495..0000000
Binary files a/test/ft-text-vertical-layout-type1-ps-ref.png and /dev/null differ
diff --git a/test/ft-text-vertical-layout-type1-ps2-ref.png b/test/ft-text-vertical-layout-type1-ps2-ref.png
new file mode 100644
index 0000000..4523495
Binary files /dev/null and b/test/ft-text-vertical-layout-type1-ps2-ref.png differ
diff --git a/test/ft-text-vertical-layout-type1-ps3-ref.png b/test/ft-text-vertical-layout-type1-ps3-ref.png
new file mode 100644
index 0000000..4523495
Binary files /dev/null and b/test/ft-text-vertical-layout-type1-ps3-ref.png differ
diff --git a/test/ft-text-vertical-layout-type3-ps-ref.png b/test/ft-text-vertical-layout-type3-ps-ref.png
deleted file mode 100644
index e6ad8fc..0000000
Binary files a/test/ft-text-vertical-layout-type3-ps-ref.png and /dev/null differ
diff --git a/test/ft-text-vertical-layout-type3-ps2-ref.png b/test/ft-text-vertical-layout-type3-ps2-ref.png
new file mode 100644
index 0000000..e6ad8fc
Binary files /dev/null and b/test/ft-text-vertical-layout-type3-ps2-ref.png differ
diff --git a/test/ft-text-vertical-layout-type3-ps3-ref.png b/test/ft-text-vertical-layout-type3-ps3-ref.png
new file mode 100644
index 0000000..e6ad8fc
Binary files /dev/null and b/test/ft-text-vertical-layout-type3-ps3-ref.png differ
diff --git a/test/glyph-cache-pressure-ps-ref.png b/test/glyph-cache-pressure-ps-ref.png
deleted file mode 100644
index 88fa447..0000000
Binary files a/test/glyph-cache-pressure-ps-ref.png and /dev/null differ
diff --git a/test/glyph-cache-pressure-ps2-ref.png b/test/glyph-cache-pressure-ps2-ref.png
new file mode 100644
index 0000000..88fa447
Binary files /dev/null and b/test/glyph-cache-pressure-ps2-ref.png differ
diff --git a/test/glyph-cache-pressure-ps3-ref.png b/test/glyph-cache-pressure-ps3-ref.png
new file mode 100644
index 0000000..88fa447
Binary files /dev/null and b/test/glyph-cache-pressure-ps3-ref.png differ
diff --git a/test/gradient-alpha-ps-argb32-ref.png b/test/gradient-alpha-ps-argb32-ref.png
deleted file mode 100644
index 37eafba..0000000
Binary files a/test/gradient-alpha-ps-argb32-ref.png and /dev/null differ
diff --git a/test/gradient-alpha-ps-rgb24-ref.png b/test/gradient-alpha-ps-rgb24-ref.png
deleted file mode 100644
index 2432c29..0000000
Binary files a/test/gradient-alpha-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/gradient-alpha-ps2-argb32-ref.png b/test/gradient-alpha-ps2-argb32-ref.png
new file mode 100644
index 0000000..37eafba
Binary files /dev/null and b/test/gradient-alpha-ps2-argb32-ref.png differ
diff --git a/test/gradient-alpha-ps2-rgb24-ref.png b/test/gradient-alpha-ps2-rgb24-ref.png
new file mode 100644
index 0000000..2432c29
Binary files /dev/null and b/test/gradient-alpha-ps2-rgb24-ref.png differ
diff --git a/test/gradient-alpha-ps3-argb32-ref.png b/test/gradient-alpha-ps3-argb32-ref.png
new file mode 100644
index 0000000..37eafba
Binary files /dev/null and b/test/gradient-alpha-ps3-argb32-ref.png differ
diff --git a/test/gradient-alpha-ps3-rgb24-ref.png b/test/gradient-alpha-ps3-rgb24-ref.png
new file mode 100644
index 0000000..2432c29
Binary files /dev/null and b/test/gradient-alpha-ps3-rgb24-ref.png differ
diff --git a/test/gradient-constant-alpha-ps-ref.png b/test/gradient-constant-alpha-ps-ref.png
deleted file mode 100644
index 7089f4f..0000000
Binary files a/test/gradient-constant-alpha-ps-ref.png and /dev/null differ
diff --git a/test/gradient-constant-alpha-ps-rgb24-ref.png b/test/gradient-constant-alpha-ps-rgb24-ref.png
deleted file mode 100644
index 5962925..0000000
Binary files a/test/gradient-constant-alpha-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/gradient-constant-alpha-ps2-ref.png b/test/gradient-constant-alpha-ps2-ref.png
new file mode 100644
index 0000000..7089f4f
Binary files /dev/null and b/test/gradient-constant-alpha-ps2-ref.png differ
diff --git a/test/gradient-constant-alpha-ps2-rgb24-ref.png b/test/gradient-constant-alpha-ps2-rgb24-ref.png
new file mode 100644
index 0000000..5962925
Binary files /dev/null and b/test/gradient-constant-alpha-ps2-rgb24-ref.png differ
diff --git a/test/gradient-constant-alpha-ps3-ref.png b/test/gradient-constant-alpha-ps3-ref.png
new file mode 100644
index 0000000..7089f4f
Binary files /dev/null and b/test/gradient-constant-alpha-ps3-ref.png differ
diff --git a/test/gradient-constant-alpha-ps3-rgb24-ref.png b/test/gradient-constant-alpha-ps3-rgb24-ref.png
new file mode 100644
index 0000000..5962925
Binary files /dev/null and b/test/gradient-constant-alpha-ps3-rgb24-ref.png differ
diff --git a/test/infinite-join-ps-ref.png b/test/infinite-join-ps-ref.png
deleted file mode 100644
index 6fba8f4..0000000
Binary files a/test/infinite-join-ps-ref.png and /dev/null differ
diff --git a/test/infinite-join-ps2-ref.png b/test/infinite-join-ps2-ref.png
new file mode 100644
index 0000000..6fba8f4
Binary files /dev/null and b/test/infinite-join-ps2-ref.png differ
diff --git a/test/infinite-join-ps3-ref.png b/test/infinite-join-ps3-ref.png
new file mode 100644
index 0000000..6fba8f4
Binary files /dev/null and b/test/infinite-join-ps3-ref.png differ
diff --git a/test/leaky-dash-ps-argb32-ref.png b/test/leaky-dash-ps-argb32-ref.png
deleted file mode 100644
index 93b8640..0000000
Binary files a/test/leaky-dash-ps-argb32-ref.png and /dev/null differ
diff --git a/test/leaky-dash-ps-rgb24-ref.png b/test/leaky-dash-ps-rgb24-ref.png
deleted file mode 100644
index c11eb48..0000000
Binary files a/test/leaky-dash-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/leaky-dash-ps2-argb32-ref.png b/test/leaky-dash-ps2-argb32-ref.png
new file mode 100644
index 0000000..93b8640
Binary files /dev/null and b/test/leaky-dash-ps2-argb32-ref.png differ
diff --git a/test/leaky-dash-ps2-rgb24-ref.png b/test/leaky-dash-ps2-rgb24-ref.png
new file mode 100644
index 0000000..c11eb48
Binary files /dev/null and b/test/leaky-dash-ps2-rgb24-ref.png differ
diff --git a/test/leaky-dash-ps3-argb32-ref.png b/test/leaky-dash-ps3-argb32-ref.png
new file mode 100644
index 0000000..93b8640
Binary files /dev/null and b/test/leaky-dash-ps3-argb32-ref.png differ
diff --git a/test/leaky-dash-ps3-rgb24-ref.png b/test/leaky-dash-ps3-rgb24-ref.png
new file mode 100644
index 0000000..c11eb48
Binary files /dev/null and b/test/leaky-dash-ps3-rgb24-ref.png differ
diff --git a/test/leaky-dashed-rectangle-ps-ref.png b/test/leaky-dashed-rectangle-ps-ref.png
deleted file mode 100644
index e432de2..0000000
Binary files a/test/leaky-dashed-rectangle-ps-ref.png and /dev/null differ
diff --git a/test/leaky-dashed-rectangle-ps2-ref.png b/test/leaky-dashed-rectangle-ps2-ref.png
new file mode 100644
index 0000000..e432de2
Binary files /dev/null and b/test/leaky-dashed-rectangle-ps2-ref.png differ
diff --git a/test/leaky-dashed-rectangle-ps3-ref.png b/test/leaky-dashed-rectangle-ps3-ref.png
new file mode 100644
index 0000000..e432de2
Binary files /dev/null and b/test/leaky-dashed-rectangle-ps3-ref.png differ
diff --git a/test/leaky-polygon-ps-ref.png b/test/leaky-polygon-ps-ref.png
deleted file mode 100644
index 5e8808c..0000000
Binary files a/test/leaky-polygon-ps-ref.png and /dev/null differ
diff --git a/test/leaky-polygon-ps2-ref.png b/test/leaky-polygon-ps2-ref.png
new file mode 100644
index 0000000..5e8808c
Binary files /dev/null and b/test/leaky-polygon-ps2-ref.png differ
diff --git a/test/leaky-polygon-ps3-ref.png b/test/leaky-polygon-ps3-ref.png
new file mode 100644
index 0000000..5e8808c
Binary files /dev/null and b/test/leaky-polygon-ps3-ref.png differ
diff --git a/test/line-width-scale-ps-ref.png b/test/line-width-scale-ps-ref.png
deleted file mode 100644
index 9d95aaf..0000000
Binary files a/test/line-width-scale-ps-ref.png and /dev/null differ
diff --git a/test/line-width-scale-ps2-ref.png b/test/line-width-scale-ps2-ref.png
new file mode 100644
index 0000000..9d95aaf
Binary files /dev/null and b/test/line-width-scale-ps2-ref.png differ
diff --git a/test/line-width-scale-ps3-ref.png b/test/line-width-scale-ps3-ref.png
new file mode 100644
index 0000000..9d95aaf
Binary files /dev/null and b/test/line-width-scale-ps3-ref.png differ
diff --git a/test/linear-gradient-ps-ref.png b/test/linear-gradient-ps-ref.png
deleted file mode 100644
index c2fa71b..0000000
Binary files a/test/linear-gradient-ps-ref.png and /dev/null differ
diff --git a/test/linear-gradient-ps3-ref.png b/test/linear-gradient-ps3-ref.png
new file mode 100644
index 0000000..c2fa71b
Binary files /dev/null and b/test/linear-gradient-ps3-ref.png differ
diff --git a/test/linear-gradient-reflect-ps-ref.png b/test/linear-gradient-reflect-ps-ref.png
deleted file mode 100644
index ea6d25c..0000000
Binary files a/test/linear-gradient-reflect-ps-ref.png and /dev/null differ
diff --git a/test/linear-gradient-reflect-ps3-ref.png b/test/linear-gradient-reflect-ps3-ref.png
new file mode 100644
index 0000000..ea6d25c
Binary files /dev/null and b/test/linear-gradient-reflect-ps3-ref.png differ
diff --git a/test/long-dashed-lines-ps-ref.png b/test/long-dashed-lines-ps-ref.png
deleted file mode 100644
index 82484f4..0000000
Binary files a/test/long-dashed-lines-ps-ref.png and /dev/null differ
diff --git a/test/long-dashed-lines-ps2-ref.png b/test/long-dashed-lines-ps2-ref.png
new file mode 100644
index 0000000..82484f4
Binary files /dev/null and b/test/long-dashed-lines-ps2-ref.png differ
diff --git a/test/long-dashed-lines-ps3-ref.png b/test/long-dashed-lines-ps3-ref.png
new file mode 100644
index 0000000..82484f4
Binary files /dev/null and b/test/long-dashed-lines-ps3-ref.png differ
diff --git a/test/meta-surface-pattern-ps-argb32-ref.png b/test/meta-surface-pattern-ps-argb32-ref.png
deleted file mode 100644
index fbd58ef..0000000
Binary files a/test/meta-surface-pattern-ps-argb32-ref.png and /dev/null differ
diff --git a/test/meta-surface-pattern-ps-rgb24-ref.png b/test/meta-surface-pattern-ps-rgb24-ref.png
deleted file mode 100644
index 84da8da..0000000
Binary files a/test/meta-surface-pattern-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/meta-surface-pattern-ps2-argb32-ref.png b/test/meta-surface-pattern-ps2-argb32-ref.png
new file mode 100644
index 0000000..fbd58ef
Binary files /dev/null and b/test/meta-surface-pattern-ps2-argb32-ref.png differ
diff --git a/test/meta-surface-pattern-ps2-rgb24-ref.png b/test/meta-surface-pattern-ps2-rgb24-ref.png
new file mode 100644
index 0000000..84da8da
Binary files /dev/null and b/test/meta-surface-pattern-ps2-rgb24-ref.png differ
diff --git a/test/meta-surface-pattern-ps3-argb32-ref.png b/test/meta-surface-pattern-ps3-argb32-ref.png
new file mode 100644
index 0000000..fbd58ef
Binary files /dev/null and b/test/meta-surface-pattern-ps3-argb32-ref.png differ
diff --git a/test/meta-surface-pattern-ps3-rgb24-ref.png b/test/meta-surface-pattern-ps3-rgb24-ref.png
new file mode 100644
index 0000000..84da8da
Binary files /dev/null and b/test/meta-surface-pattern-ps3-rgb24-ref.png differ
diff --git a/test/new-sub-path-ps-argb32-ref.png b/test/new-sub-path-ps-argb32-ref.png
deleted file mode 100644
index 69257d9..0000000
Binary files a/test/new-sub-path-ps-argb32-ref.png and /dev/null differ
diff --git a/test/new-sub-path-ps-rgb24-ref.png b/test/new-sub-path-ps-rgb24-ref.png
deleted file mode 100644
index bceb5b7..0000000
Binary files a/test/new-sub-path-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/new-sub-path-ps2-argb32-ref.png b/test/new-sub-path-ps2-argb32-ref.png
new file mode 100644
index 0000000..69257d9
Binary files /dev/null and b/test/new-sub-path-ps2-argb32-ref.png differ
diff --git a/test/new-sub-path-ps2-rgb24-ref.png b/test/new-sub-path-ps2-rgb24-ref.png
new file mode 100644
index 0000000..bceb5b7
Binary files /dev/null and b/test/new-sub-path-ps2-rgb24-ref.png differ
diff --git a/test/new-sub-path-ps3-argb32-ref.png b/test/new-sub-path-ps3-argb32-ref.png
new file mode 100644
index 0000000..69257d9
Binary files /dev/null and b/test/new-sub-path-ps3-argb32-ref.png differ
diff --git a/test/new-sub-path-ps3-rgb24-ref.png b/test/new-sub-path-ps3-rgb24-ref.png
new file mode 100644
index 0000000..bceb5b7
Binary files /dev/null and b/test/new-sub-path-ps3-rgb24-ref.png differ
diff --git a/test/over-above-source-ps-argb32-ref.png b/test/over-above-source-ps-argb32-ref.png
deleted file mode 100644
index 886faad..0000000
Binary files a/test/over-above-source-ps-argb32-ref.png and /dev/null differ
diff --git a/test/over-above-source-ps2-argb32-ref.png b/test/over-above-source-ps2-argb32-ref.png
new file mode 100644
index 0000000..886faad
Binary files /dev/null and b/test/over-above-source-ps2-argb32-ref.png differ
diff --git a/test/over-above-source-ps3-argb32-ref.png b/test/over-above-source-ps3-argb32-ref.png
new file mode 100644
index 0000000..886faad
Binary files /dev/null and b/test/over-above-source-ps3-argb32-ref.png differ
diff --git a/test/over-around-source-ps-argb32-ref.png b/test/over-around-source-ps-argb32-ref.png
deleted file mode 100644
index ea6de69..0000000
Binary files a/test/over-around-source-ps-argb32-ref.png and /dev/null differ
diff --git a/test/over-around-source-ps-rgb24-ref.png b/test/over-around-source-ps-rgb24-ref.png
deleted file mode 100644
index ee325ea..0000000
Binary files a/test/over-around-source-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/over-around-source-ps2-argb32-ref.png b/test/over-around-source-ps2-argb32-ref.png
new file mode 100644
index 0000000..ea6de69
Binary files /dev/null and b/test/over-around-source-ps2-argb32-ref.png differ
diff --git a/test/over-around-source-ps2-rgb24-ref.png b/test/over-around-source-ps2-rgb24-ref.png
new file mode 100644
index 0000000..ee325ea
Binary files /dev/null and b/test/over-around-source-ps2-rgb24-ref.png differ
diff --git a/test/over-around-source-ps3-argb32-ref.png b/test/over-around-source-ps3-argb32-ref.png
new file mode 100644
index 0000000..ea6de69
Binary files /dev/null and b/test/over-around-source-ps3-argb32-ref.png differ
diff --git a/test/over-around-source-ps3-rgb24-ref.png b/test/over-around-source-ps3-rgb24-ref.png
new file mode 100644
index 0000000..ee325ea
Binary files /dev/null and b/test/over-around-source-ps3-rgb24-ref.png differ
diff --git a/test/over-below-source-ps-argb32-ref.png b/test/over-below-source-ps-argb32-ref.png
deleted file mode 100644
index 980ad5f..0000000
Binary files a/test/over-below-source-ps-argb32-ref.png and /dev/null differ
diff --git a/test/over-below-source-ps2-argb32-ref.png b/test/over-below-source-ps2-argb32-ref.png
new file mode 100644
index 0000000..980ad5f
Binary files /dev/null and b/test/over-below-source-ps2-argb32-ref.png differ
diff --git a/test/over-below-source-ps3-argb32-ref.png b/test/over-below-source-ps3-argb32-ref.png
new file mode 100644
index 0000000..980ad5f
Binary files /dev/null and b/test/over-below-source-ps3-argb32-ref.png differ
diff --git a/test/over-between-source-ps-argb32-ref.png b/test/over-between-source-ps-argb32-ref.png
deleted file mode 100644
index 43e9424..0000000
Binary files a/test/over-between-source-ps-argb32-ref.png and /dev/null differ
diff --git a/test/over-between-source-ps2-argb32-ref.png b/test/over-between-source-ps2-argb32-ref.png
new file mode 100644
index 0000000..43e9424
Binary files /dev/null and b/test/over-between-source-ps2-argb32-ref.png differ
diff --git a/test/over-between-source-ps3-argb32-ref.png b/test/over-between-source-ps3-argb32-ref.png
new file mode 100644
index 0000000..43e9424
Binary files /dev/null and b/test/over-between-source-ps3-argb32-ref.png differ
diff --git a/test/random-intersections-ps-ref.png b/test/random-intersections-ps-ref.png
deleted file mode 100644
index 590c832..0000000
Binary files a/test/random-intersections-ps-ref.png and /dev/null differ
diff --git a/test/random-intersections-ps2-ref.png b/test/random-intersections-ps2-ref.png
new file mode 100644
index 0000000..590c832
Binary files /dev/null and b/test/random-intersections-ps2-ref.png differ
diff --git a/test/random-intersections-ps3-ref.png b/test/random-intersections-ps3-ref.png
new file mode 100644
index 0000000..590c832
Binary files /dev/null and b/test/random-intersections-ps3-ref.png differ
diff --git a/test/rectilinear-miter-limit-ps-ref.png b/test/rectilinear-miter-limit-ps-ref.png
deleted file mode 100644
index 8213060..0000000
Binary files a/test/rectilinear-miter-limit-ps-ref.png and /dev/null differ
diff --git a/test/rectilinear-miter-limit-ps2-ref.png b/test/rectilinear-miter-limit-ps2-ref.png
new file mode 100644
index 0000000..8213060
Binary files /dev/null and b/test/rectilinear-miter-limit-ps2-ref.png differ
diff --git a/test/rectilinear-miter-limit-ps3-ref.png b/test/rectilinear-miter-limit-ps3-ref.png
new file mode 100644
index 0000000..8213060
Binary files /dev/null and b/test/rectilinear-miter-limit-ps3-ref.png differ
diff --git a/test/reflected-stroke-ps-ref.png b/test/reflected-stroke-ps-ref.png
deleted file mode 100644
index 6290a17..0000000
Binary files a/test/reflected-stroke-ps-ref.png and /dev/null differ
diff --git a/test/reflected-stroke-ps2-ref.png b/test/reflected-stroke-ps2-ref.png
new file mode 100644
index 0000000..6290a17
Binary files /dev/null and b/test/reflected-stroke-ps2-ref.png differ
diff --git a/test/reflected-stroke-ps3-ref.png b/test/reflected-stroke-ps3-ref.png
new file mode 100644
index 0000000..6290a17
Binary files /dev/null and b/test/reflected-stroke-ps3-ref.png differ
diff --git a/test/rel-path-ps-rgb24-ref.png b/test/rel-path-ps-rgb24-ref.png
deleted file mode 100644
index ccdcebb..0000000
Binary files a/test/rel-path-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/rel-path-ps2-rgb24-ref.png b/test/rel-path-ps2-rgb24-ref.png
new file mode 100644
index 0000000..ccdcebb
Binary files /dev/null and b/test/rel-path-ps2-rgb24-ref.png differ
diff --git a/test/rel-path-ps3-rgb24-ref.png b/test/rel-path-ps3-rgb24-ref.png
new file mode 100644
index 0000000..ccdcebb
Binary files /dev/null and b/test/rel-path-ps3-rgb24-ref.png differ
diff --git a/test/rotate-image-surface-paint-ps-ref.png b/test/rotate-image-surface-paint-ps-ref.png
deleted file mode 100644
index dd72506..0000000
Binary files a/test/rotate-image-surface-paint-ps-ref.png and /dev/null differ
diff --git a/test/rotate-image-surface-paint-ps2-ref.png b/test/rotate-image-surface-paint-ps2-ref.png
new file mode 100644
index 0000000..dd72506
Binary files /dev/null and b/test/rotate-image-surface-paint-ps2-ref.png differ
diff --git a/test/rotate-image-surface-paint-ps3-ref.png b/test/rotate-image-surface-paint-ps3-ref.png
new file mode 100644
index 0000000..dd72506
Binary files /dev/null and b/test/rotate-image-surface-paint-ps3-ref.png differ
diff --git a/test/select-font-face-ps-ref.png b/test/select-font-face-ps-ref.png
deleted file mode 100644
index 6c2f361..0000000
Binary files a/test/select-font-face-ps-ref.png and /dev/null differ
diff --git a/test/select-font-face-ps2-ref.png b/test/select-font-face-ps2-ref.png
new file mode 100644
index 0000000..6c2f361
Binary files /dev/null and b/test/select-font-face-ps2-ref.png differ
diff --git a/test/select-font-face-ps3-ref.png b/test/select-font-face-ps3-ref.png
new file mode 100644
index 0000000..6c2f361
Binary files /dev/null and b/test/select-font-face-ps3-ref.png differ
diff --git a/test/self-copy-ps-ref.png b/test/self-copy-ps-ref.png
deleted file mode 100644
index 5c9dd57..0000000
Binary files a/test/self-copy-ps-ref.png and /dev/null differ
diff --git a/test/self-copy-ps2-ref.png b/test/self-copy-ps2-ref.png
new file mode 100644
index 0000000..5c9dd57
Binary files /dev/null and b/test/self-copy-ps2-ref.png differ
diff --git a/test/self-copy-ps3-ref.png b/test/self-copy-ps3-ref.png
new file mode 100644
index 0000000..5c9dd57
Binary files /dev/null and b/test/self-copy-ps3-ref.png differ
diff --git a/test/show-text-current-point-ps-ref.png b/test/show-text-current-point-ps-ref.png
deleted file mode 100644
index b42c48e..0000000
Binary files a/test/show-text-current-point-ps-ref.png and /dev/null differ
diff --git a/test/show-text-current-point-ps2-ref.png b/test/show-text-current-point-ps2-ref.png
new file mode 100644
index 0000000..b42c48e
Binary files /dev/null and b/test/show-text-current-point-ps2-ref.png differ
diff --git a/test/show-text-current-point-ps3-ref.png b/test/show-text-current-point-ps3-ref.png
new file mode 100644
index 0000000..b42c48e
Binary files /dev/null and b/test/show-text-current-point-ps3-ref.png differ
diff --git a/test/skew-extreme-ps-ref.png b/test/skew-extreme-ps-ref.png
deleted file mode 100644
index 69f1d37..0000000
Binary files a/test/skew-extreme-ps-ref.png and /dev/null differ
diff --git a/test/skew-extreme-ps2-ref.png b/test/skew-extreme-ps2-ref.png
new file mode 100644
index 0000000..69f1d37
Binary files /dev/null and b/test/skew-extreme-ps2-ref.png differ
diff --git a/test/skew-extreme-ps3-ref.png b/test/skew-extreme-ps3-ref.png
new file mode 100644
index 0000000..69f1d37
Binary files /dev/null and b/test/skew-extreme-ps3-ref.png differ
diff --git a/test/smask-ps-ref.png b/test/smask-ps-ref.png
deleted file mode 100644
index c006bbd..0000000
Binary files a/test/smask-ps-ref.png and /dev/null differ
diff --git a/test/smask-ps2-ref.png b/test/smask-ps2-ref.png
new file mode 100644
index 0000000..c006bbd
Binary files /dev/null and b/test/smask-ps2-ref.png differ
diff --git a/test/smask-ps3-ref.png b/test/smask-ps3-ref.png
new file mode 100644
index 0000000..c006bbd
Binary files /dev/null and b/test/smask-ps3-ref.png differ
diff --git a/test/smask-text-ps-ref.png b/test/smask-text-ps-ref.png
deleted file mode 100644
index ae61325..0000000
Binary files a/test/smask-text-ps-ref.png and /dev/null differ
diff --git a/test/smask-text-ps2-ref.png b/test/smask-text-ps2-ref.png
new file mode 100644
index 0000000..ae61325
Binary files /dev/null and b/test/smask-text-ps2-ref.png differ
diff --git a/test/smask-text-ps3-ref.png b/test/smask-text-ps3-ref.png
new file mode 100644
index 0000000..ae61325
Binary files /dev/null and b/test/smask-text-ps3-ref.png differ
diff --git a/test/source-clip-scale-ps-argb32-ref.png b/test/source-clip-scale-ps-argb32-ref.png
deleted file mode 100644
index be57d77..0000000
Binary files a/test/source-clip-scale-ps-argb32-ref.png and /dev/null differ
diff --git a/test/source-clip-scale-ps-rgb24-ref.png b/test/source-clip-scale-ps-rgb24-ref.png
deleted file mode 100644
index be57d77..0000000
Binary files a/test/source-clip-scale-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/source-clip-scale-ps2-argb32-ref.png b/test/source-clip-scale-ps2-argb32-ref.png
new file mode 100644
index 0000000..be57d77
Binary files /dev/null and b/test/source-clip-scale-ps2-argb32-ref.png differ
diff --git a/test/source-clip-scale-ps2-rgb24-ref.png b/test/source-clip-scale-ps2-rgb24-ref.png
new file mode 100644
index 0000000..be57d77
Binary files /dev/null and b/test/source-clip-scale-ps2-rgb24-ref.png differ
diff --git a/test/source-clip-scale-ps3-argb32-ref.png b/test/source-clip-scale-ps3-argb32-ref.png
new file mode 100644
index 0000000..be57d77
Binary files /dev/null and b/test/source-clip-scale-ps3-argb32-ref.png differ
diff --git a/test/source-clip-scale-ps3-rgb24-ref.png b/test/source-clip-scale-ps3-rgb24-ref.png
new file mode 100644
index 0000000..be57d77
Binary files /dev/null and b/test/source-clip-scale-ps3-rgb24-ref.png differ
diff --git a/test/stroke-ctm-caps-ps-ref.png b/test/stroke-ctm-caps-ps-ref.png
deleted file mode 100644
index 63c1064..0000000
Binary files a/test/stroke-ctm-caps-ps-ref.png and /dev/null differ
diff --git a/test/stroke-ctm-caps-ps2-ref.png b/test/stroke-ctm-caps-ps2-ref.png
new file mode 100644
index 0000000..63c1064
Binary files /dev/null and b/test/stroke-ctm-caps-ps2-ref.png differ
diff --git a/test/stroke-ctm-caps-ps3-ref.png b/test/stroke-ctm-caps-ps3-ref.png
new file mode 100644
index 0000000..63c1064
Binary files /dev/null and b/test/stroke-ctm-caps-ps3-ref.png differ
diff --git a/test/stroke-image-ps-ref.png b/test/stroke-image-ps-ref.png
deleted file mode 100644
index f557c75..0000000
Binary files a/test/stroke-image-ps-ref.png and /dev/null differ
diff --git a/test/stroke-image-ps2-ref.png b/test/stroke-image-ps2-ref.png
new file mode 100644
index 0000000..f557c75
Binary files /dev/null and b/test/stroke-image-ps2-ref.png differ
diff --git a/test/stroke-image-ps3-ref.png b/test/stroke-image-ps3-ref.png
new file mode 100644
index 0000000..f557c75
Binary files /dev/null and b/test/stroke-image-ps3-ref.png differ
diff --git a/test/surface-pattern-ps-argb32-ref.png b/test/surface-pattern-ps-argb32-ref.png
deleted file mode 100644
index 2ec3a53..0000000
Binary files a/test/surface-pattern-ps-argb32-ref.png and /dev/null differ
diff --git a/test/surface-pattern-ps2-argb32-ref.png b/test/surface-pattern-ps2-argb32-ref.png
new file mode 100644
index 0000000..2ec3a53
Binary files /dev/null and b/test/surface-pattern-ps2-argb32-ref.png differ
diff --git a/test/surface-pattern-ps3-argb32-ref.png b/test/surface-pattern-ps3-argb32-ref.png
new file mode 100644
index 0000000..2ec3a53
Binary files /dev/null and b/test/surface-pattern-ps3-argb32-ref.png differ
diff --git a/test/surface-pattern-scale-down-ps-argb32-ref.png b/test/surface-pattern-scale-down-ps-argb32-ref.png
deleted file mode 100644
index 1f0b3e0..0000000
Binary files a/test/surface-pattern-scale-down-ps-argb32-ref.png and /dev/null differ
diff --git a/test/surface-pattern-scale-down-ps2-argb32-ref.png b/test/surface-pattern-scale-down-ps2-argb32-ref.png
new file mode 100644
index 0000000..1f0b3e0
Binary files /dev/null and b/test/surface-pattern-scale-down-ps2-argb32-ref.png differ
diff --git a/test/surface-pattern-scale-down-ps3-argb32-ref.png b/test/surface-pattern-scale-down-ps3-argb32-ref.png
new file mode 100644
index 0000000..1f0b3e0
Binary files /dev/null and b/test/surface-pattern-scale-down-ps3-argb32-ref.png differ
diff --git a/test/surface-pattern-scale-up-ps-argb32-ref.png b/test/surface-pattern-scale-up-ps-argb32-ref.png
deleted file mode 100644
index dc9f8d2..0000000
Binary files a/test/surface-pattern-scale-up-ps-argb32-ref.png and /dev/null differ
diff --git a/test/surface-pattern-scale-up-ps2-argb32-ref.png b/test/surface-pattern-scale-up-ps2-argb32-ref.png
new file mode 100644
index 0000000..dc9f8d2
Binary files /dev/null and b/test/surface-pattern-scale-up-ps2-argb32-ref.png differ
diff --git a/test/surface-pattern-scale-up-ps3-argb32-ref.png b/test/surface-pattern-scale-up-ps3-argb32-ref.png
new file mode 100644
index 0000000..dc9f8d2
Binary files /dev/null and b/test/surface-pattern-scale-up-ps3-argb32-ref.png differ
diff --git a/test/text-pattern-ps-argb32-ref.png b/test/text-pattern-ps-argb32-ref.png
deleted file mode 100644
index fa68f64..0000000
Binary files a/test/text-pattern-ps-argb32-ref.png and /dev/null differ
diff --git a/test/text-pattern-ps-rgb24-ref.png b/test/text-pattern-ps-rgb24-ref.png
deleted file mode 100644
index 943149c..0000000
Binary files a/test/text-pattern-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/text-pattern-ps3-argb32-ref.png b/test/text-pattern-ps3-argb32-ref.png
new file mode 100644
index 0000000..fa68f64
Binary files /dev/null and b/test/text-pattern-ps3-argb32-ref.png differ
diff --git a/test/text-pattern-ps3-rgb24-ref.png b/test/text-pattern-ps3-rgb24-ref.png
new file mode 100644
index 0000000..943149c
Binary files /dev/null and b/test/text-pattern-ps3-rgb24-ref.png differ
diff --git a/test/text-rotate-ps-ref.png b/test/text-rotate-ps-ref.png
deleted file mode 100644
index 125736b..0000000
Binary files a/test/text-rotate-ps-ref.png and /dev/null differ
diff --git a/test/text-rotate-ps2-ref.png b/test/text-rotate-ps2-ref.png
new file mode 100644
index 0000000..125736b
Binary files /dev/null and b/test/text-rotate-ps2-ref.png differ
diff --git a/test/text-rotate-ps3-ref.png b/test/text-rotate-ps3-ref.png
new file mode 100644
index 0000000..125736b
Binary files /dev/null and b/test/text-rotate-ps3-ref.png differ
diff --git a/test/text-transform-ps-ref.png b/test/text-transform-ps-ref.png
deleted file mode 100644
index 6f33fb6..0000000
Binary files a/test/text-transform-ps-ref.png and /dev/null differ
diff --git a/test/text-transform-ps2-ref.png b/test/text-transform-ps2-ref.png
new file mode 100644
index 0000000..6f33fb6
Binary files /dev/null and b/test/text-transform-ps2-ref.png differ
diff --git a/test/text-transform-ps3-ref.png b/test/text-transform-ps3-ref.png
new file mode 100644
index 0000000..6f33fb6
Binary files /dev/null and b/test/text-transform-ps3-ref.png differ
diff --git a/test/transforms-ps-ref.png b/test/transforms-ps-ref.png
deleted file mode 100644
index 6d195aa..0000000
Binary files a/test/transforms-ps-ref.png and /dev/null differ
diff --git a/test/transforms-ps2-ref.png b/test/transforms-ps2-ref.png
new file mode 100644
index 0000000..6d195aa
Binary files /dev/null and b/test/transforms-ps2-ref.png differ
diff --git a/test/transforms-ps3-ref.png b/test/transforms-ps3-ref.png
new file mode 100644
index 0000000..6d195aa
Binary files /dev/null and b/test/transforms-ps3-ref.png differ
diff --git a/test/trap-clip-ps-argb32-ref.png b/test/trap-clip-ps-argb32-ref.png
deleted file mode 100644
index 8bbd1fd..0000000
Binary files a/test/trap-clip-ps-argb32-ref.png and /dev/null differ
diff --git a/test/trap-clip-ps-rgb24-ref.png b/test/trap-clip-ps-rgb24-ref.png
deleted file mode 100644
index f3ded80..0000000
Binary files a/test/trap-clip-ps-rgb24-ref.png and /dev/null differ
diff --git a/test/trap-clip-ps3-argb32-ref.png b/test/trap-clip-ps3-argb32-ref.png
new file mode 100644
index 0000000..8bbd1fd
Binary files /dev/null and b/test/trap-clip-ps3-argb32-ref.png differ
diff --git a/test/trap-clip-ps3-rgb24-ref.png b/test/trap-clip-ps3-rgb24-ref.png
new file mode 100644
index 0000000..f3ded80
Binary files /dev/null and b/test/trap-clip-ps3-rgb24-ref.png differ
diff --git a/test/user-font-proxy-ps-ref.png b/test/user-font-proxy-ps-ref.png
deleted file mode 100644
index 0d90244..0000000
Binary files a/test/user-font-proxy-ps-ref.png and /dev/null differ
diff --git a/test/user-font-proxy-ps2-ref.png b/test/user-font-proxy-ps2-ref.png
new file mode 100644
index 0000000..0d90244
Binary files /dev/null and b/test/user-font-proxy-ps2-ref.png differ
diff --git a/test/user-font-proxy-ps3-ref.png b/test/user-font-proxy-ps3-ref.png
new file mode 100644
index 0000000..0d90244
Binary files /dev/null and b/test/user-font-proxy-ps3-ref.png differ
diff --git a/test/user-font-ps-ref.png b/test/user-font-ps-ref.png
deleted file mode 100644
index e1dd00a..0000000
Binary files a/test/user-font-ps-ref.png and /dev/null differ
diff --git a/test/user-font-ps2-ref.png b/test/user-font-ps2-ref.png
new file mode 100644
index 0000000..e1dd00a
Binary files /dev/null and b/test/user-font-ps2-ref.png differ
diff --git a/test/user-font-ps3-ref.png b/test/user-font-ps3-ref.png
new file mode 100644
index 0000000..e1dd00a
Binary files /dev/null and b/test/user-font-ps3-ref.png differ
diff --git a/test/user-font-rescale-ps-ref.png b/test/user-font-rescale-ps-ref.png
deleted file mode 100644
index 7e112da..0000000
Binary files a/test/user-font-rescale-ps-ref.png and /dev/null differ
diff --git a/test/user-font-rescale-ps2-ref.png b/test/user-font-rescale-ps2-ref.png
new file mode 100644
index 0000000..7e112da
Binary files /dev/null and b/test/user-font-rescale-ps2-ref.png differ
diff --git a/test/user-font-rescale-ps3-ref.png b/test/user-font-rescale-ps3-ref.png
new file mode 100644
index 0000000..7e112da
Binary files /dev/null and b/test/user-font-rescale-ps3-ref.png differ
commit 0c030d3b768718eac5d429d0c819934f32896b25
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Sep 26 15:26:40 2008 +0100

    [boilerplate] Add svg-1.2 target.
    
    SVG 1.2 is sufficiently different from 1.1 that it has separate code
    paths within cairo-svg-surface and so justifies its own boilerplate
    target.

diff --git a/boilerplate/cairo-boilerplate-svg-private.h b/boilerplate/cairo-boilerplate-svg-private.h
index ea42948..075bdcd 100644
--- a/boilerplate/cairo-boilerplate-svg-private.h
+++ b/boilerplate/cairo-boilerplate-svg-private.h
@@ -28,15 +28,27 @@
 #define _CAIRO_BOILERPLATE_SVG_PRIVATE_H_
 
 cairo_surface_t *
-_cairo_boilerplate_svg_create_surface (const char		 *name,
-				       cairo_content_t		  content,
-				       int			  width,
-				       int			  height,
-				       int			  max_width,
-				       int			  max_height,
-				       cairo_boilerplate_mode_t	  mode,
-				       int                        id,
-				       void			**closure);
+_cairo_boilerplate_svg11_create_surface (const char		 *name,
+					 cairo_content_t          content,
+					 int			  width,
+					 int			  height,
+					 int			  max_width,
+					 int			  max_height,
+					 cairo_boilerplate_mode_t mode,
+					 int                      id,
+					 void			**closure);
+
+cairo_surface_t *
+_cairo_boilerplate_svg12_create_surface (const char		 *name,
+					 cairo_content_t	  content,
+					 int			  width,
+					 int			  height,
+					 int			  max_width,
+					 int			  max_height,
+					 cairo_boilerplate_mode_t mode,
+					 int                      id,
+					 void			**closure);
+
 
 cairo_status_t
 _cairo_boilerplate_svg_finish_surface (cairo_surface_t		*surface);
diff --git a/boilerplate/cairo-boilerplate-svg.c b/boilerplate/cairo-boilerplate-svg.c
index c3ad8d2..227088c 100644
--- a/boilerplate/cairo-boilerplate-svg.c
+++ b/boilerplate/cairo-boilerplate-svg.c
@@ -39,16 +39,16 @@
 
 cairo_user_data_key_t	svg_closure_key;
 
-typedef struct _svg_target_closure
-{
+typedef struct _svg_target_closure {
     char    *filename;
     int	    width, height;
     cairo_surface_t	*target;
 } svg_target_closure_t;
 
-cairo_surface_t *
+static cairo_surface_t *
 _cairo_boilerplate_svg_create_surface (const char		 *name,
 				       cairo_content_t		  content,
+				       cairo_svg_version_t	  version,
 				       int			  width,
 				       int			  height,
 				       int			  max_width,
@@ -73,6 +73,7 @@ _cairo_boilerplate_svg_create_surface (const char		 *name,
     if (cairo_surface_status (surface))
 	goto CLEANUP_FILENAME;
 
+    cairo_svg_surface_restrict_to_version (surface, version);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
     if (content == CAIRO_CONTENT_COLOR) {
@@ -101,6 +102,45 @@ _cairo_boilerplate_svg_create_surface (const char		 *name,
     return surface;
 }
 
+cairo_surface_t *
+_cairo_boilerplate_svg11_create_surface (const char		 *name,
+					 cairo_content_t	  content,
+					 int			  width,
+					 int			  height,
+					 int			  max_width,
+					 int			  max_height,
+					 cairo_boilerplate_mode_t	  mode,
+					 int                        id,
+					 void			**closure)
+{
+    /* current default, but be explicit in case the default changes */
+    return _cairo_boilerplate_svg_create_surface (name, content,
+						  CAIRO_SVG_VERSION_1_1,
+						  width, height,
+						  max_width, max_height,
+						  mode, id,
+						  closure);
+}
+
+cairo_surface_t *
+_cairo_boilerplate_svg12_create_surface (const char		 *name,
+					 cairo_content_t	  content,
+					 int			  width,
+					 int			  height,
+					 int			  max_width,
+					 int			  max_height,
+					 cairo_boilerplate_mode_t	  mode,
+					 int                        id,
+					 void			**closure)
+{
+    return _cairo_boilerplate_svg_create_surface (name, content,
+						  CAIRO_SVG_VERSION_1_2,
+						  width, height,
+						  max_width, max_height,
+						  mode, id,
+						  closure);
+}
+
 cairo_status_t
 _cairo_boilerplate_svg_finish_surface (cairo_surface_t		*surface)
 {
@@ -207,7 +247,7 @@ cairo_boilerplate_svg_surface_force_fallbacks (cairo_surface_t *abstract_surface
     cairo_paginated_surface_t *paginated = (cairo_paginated_surface_t*) abstract_surface;
     cairo_svg_surface_t *surface;
 
-    if (cairo_surface_get_type (abstract_surface) != CAIRO_SURFACE_TYPE_PDF)
+    if (cairo_surface_get_type (abstract_surface) != CAIRO_SURFACE_TYPE_SVG)
 	return CAIRO_STATUS_SURFACE_TYPE_MISMATCH;
 
     surface = (cairo_svg_surface_t*) paginated->target;
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index 65898e1..7c9890f 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -479,20 +479,34 @@ static cairo_boilerplate_target_t targets[] =
       NULL, TRUE },
 #endif
 #if CAIRO_HAS_SVG_SURFACE && CAIRO_CAN_TEST_SVG_SURFACE
-    /* It seems we should be able to round-trip SVG content perfrectly
+    /* It seems we should be able to round-trip SVG content perfectly
      * through librsvg and cairo, but for some mysterious reason, some
      * systems get an error of 1 for some pixels on some of the text
      * tests. XXX: I'd still like to chase these down at some point.
      * For now just set the svg error tolerance to 1. */
-    { "svg", ".svg", CAIRO_SURFACE_TYPE_SVG, CAIRO_CONTENT_COLOR_ALPHA, 1,
-      _cairo_boilerplate_svg_create_surface,
+    { "svg11", ".svg", CAIRO_SURFACE_TYPE_SVG, CAIRO_CONTENT_COLOR_ALPHA, 1,
+      _cairo_boilerplate_svg11_create_surface,
       _cairo_boilerplate_svg_finish_surface,
       _cairo_boilerplate_svg_get_image_surface,
       _cairo_boilerplate_svg_surface_write_to_png,
       _cairo_boilerplate_svg_cleanup,
       NULL, TRUE },
-    { "svg", ".svg", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 1,
-      _cairo_boilerplate_svg_create_surface,
+    { "svg11", ".svg", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 1,
+      _cairo_boilerplate_svg11_create_surface,
+      _cairo_boilerplate_svg_finish_surface,
+      _cairo_boilerplate_svg_get_image_surface,
+      _cairo_boilerplate_svg_surface_write_to_png,
+      _cairo_boilerplate_svg_cleanup,
+      NULL, TRUE },
+    { "svg12", ".svg", CAIRO_SURFACE_TYPE_SVG, CAIRO_CONTENT_COLOR_ALPHA, 1,
+      _cairo_boilerplate_svg12_create_surface,
+      _cairo_boilerplate_svg_finish_surface,
+      _cairo_boilerplate_svg_get_image_surface,
+      _cairo_boilerplate_svg_surface_write_to_png,
+      _cairo_boilerplate_svg_cleanup,
+      NULL, TRUE },
+    { "svg12", ".svg", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 1,
+      _cairo_boilerplate_svg12_create_surface,
       _cairo_boilerplate_svg_finish_surface,
       _cairo_boilerplate_svg_get_image_surface,
       _cairo_boilerplate_svg_surface_write_to_png,
diff --git a/test/Makefile.am b/test/Makefile.am
index 1081bb0..0a0d499 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -307,7 +307,8 @@ REFERENCE_IMAGES = \
 	bitmap-font-rgb24-ref.png	\
 	caps-joins-alpha-quartz-ref.png	\
 	caps-joins-alpha-ref.png	\
-	caps-joins-alpha-svg-ref.png	\
+	caps-joins-alpha-svg12-ref.png	\
+	caps-joins-alpha-svg11-ref.png	\
 	caps-joins-ref.png	\
 	caps-joins-ps-ref.png	\
 	caps-sub-paths-ref.png	\
@@ -442,24 +443,28 @@ REFERENCE_IMAGES = \
 	font-matrix-translation-ps-argb32-ref.png	\
 	font-matrix-translation-ps-rgb24-ref.png	\
 	font-matrix-translation-ref.png	\
-	font-matrix-translation-svg-ref.png	\
+	font-matrix-translation-svg12-ref.png	\
+	font-matrix-translation-svg11-ref.png	\
 	font-matrix-translation-quartz-ref.png \
 	ft-text-antialias-none-ps-argb32-ref.png	\
 	ft-text-antialias-none-ref.png	\
 	ft-show-glyphs-positioning-ref.png		\
 	ft-show-glyphs-positioning-pdf-ref.png		\
 	ft-show-glyphs-positioning-ps-ref.png		\
-	ft-show-glyphs-positioning-svg-ref.png		\
+	ft-show-glyphs-positioning-svg12-ref.png		\
+	ft-show-glyphs-positioning-svg11-ref.png		\
 	ft-show-glyphs-table-ref.png			\
 	ft-show-glyphs-table-ps-ref.png			\
 	ft-text-vertical-layout-type1-pdf-ref.png	\
 	ft-text-vertical-layout-type1-ps-ref.png	\
 	ft-text-vertical-layout-type1-ref.png	\
-	ft-text-vertical-layout-type1-svg-ref.png	\
+	ft-text-vertical-layout-type1-svg12-ref.png	\
+	ft-text-vertical-layout-type1-svg11-ref.png	\
 	ft-text-vertical-layout-type3-pdf-ref.png	\
 	ft-text-vertical-layout-type3-ps-ref.png	\
 	ft-text-vertical-layout-type3-ref.png	\
-	ft-text-vertical-layout-type3-svg-ref.png	\
+	ft-text-vertical-layout-type3-svg12-ref.png	\
+	ft-text-vertical-layout-type3-svg11-ref.png	\
 	get-group-target-ref.png	\
 	glitz-surface-source-ref.png \
 	glyph-cache-pressure-ref.png	\
@@ -503,7 +508,8 @@ REFERENCE_IMAGES = \
 	linear-gradient-ps-ref.png	\
 	linear-gradient-quartz-ref.png	\
 	linear-gradient-ref.png	\
-	linear-gradient-svg-ref.png	\
+	linear-gradient-svg12-ref.png	\
+	linear-gradient-svg11-ref.png	\
 	line-width-ref.png	\
 	line-width-scale-ps-ref.png	\
 	line-width-scale-quartz-ref.png	\
@@ -533,7 +539,8 @@ REFERENCE_IMAGES = \
 	mask-transformed-image-ref.png	\
 	mask-transformed-similar-ref.png	\
 	mask-transformed-similar-pdf-ref.png	\
-	mask-transformed-similar-svg-ref.png	\
+	mask-transformed-similar-svg12-ref.png	\
+	mask-transformed-similar-svg11-ref.png	\
 	meta-surface-pattern-ref.png		\
 	meta-surface-pattern-rgb24-ref.png	\
 	meta-surface-pattern-pdf-ref.png	\
@@ -593,9 +600,11 @@ REFERENCE_IMAGES = \
 	paint-repeat-ref.png	\
 	paint-source-alpha-pdf-argb32-ref.png	\
 	paint-source-alpha-ref.png	\
-	paint-source-alpha-svg-ref.png	\
+	paint-source-alpha-svg12-ref.png	\
+	paint-source-alpha-svg11-ref.png	\
 	paint-with-alpha-ref.png	\
-	paint-with-alpha-svg-ref.png	\
+	paint-with-alpha-svg12-ref.png	\
+	paint-with-alpha-svg11-ref.png	\
 	paint-source-alpha-pdf-ref.png \
 	paint-with-alpha-pdf-ref.png \
 	pattern-getters-ref.png	\
@@ -611,7 +620,8 @@ REFERENCE_IMAGES = \
 	radial-gradient-ref.png	\
 	radial-gradient-pdf-ref.png \
 	radial-gradient-quartz-ref.png \
-	radial-gradient-svg-ref.png	\
+	radial-gradient-svg12-ref.png	\
+	radial-gradient-svg11-ref.png	\
 	random-intersections-ref.png	\
 	random-intersections-ps-ref.png \
 	random-intersections-quartz-ref.png \
@@ -634,7 +644,8 @@ REFERENCE_IMAGES = \
 	rotate-image-surface-paint-pdf-argb32-ref.png	\
 	rotate-image-surface-paint-quartz-ref.png	\
 	rotate-image-surface-paint-ref.png	\
-	rotate-image-surface-paint-svg-ref.png	\
+	rotate-image-surface-paint-svg12-ref.png	\
+	rotate-image-surface-paint-svg11-ref.png	\
 	scale-down-source-surface-paint-ref.png	\
 	scale-source-surface-paint-pdf-argb32-ref.png	\
 	scale-source-surface-paint-ref.png	\
@@ -665,24 +676,29 @@ REFERENCE_IMAGES = \
 	smask-ref.png			\
 	smask-pdf-ref.png		\
 	smask-ps-ref.png		\
-	smask-svg-ref.png		\
+	smask-svg12-ref.png		\
+	smask-svg11-ref.png		\
 	smask-fill-ref.png		\
 	smask-fill-pdf-ref.png		\
-	smask-fill-svg-ref.png		\
+	smask-fill-svg12-ref.png	\
+	smask-fill-svg11-ref.png	\
 	smask-image-mask-ref.png	\
 	smask-image-mask-pdf-ref.png	\
 	smask-mask-ref.png		\
 	smask-mask-pdf-ref.png		\
-	smask-mask-svg-ref.png		\
+	smask-mask-svg12-ref.png	\
+	smask-mask-svg11-ref.png	\
 	smask-paint-ref.png		\
 	smask-paint-pdf-ref.png		\
-	smask-paint-svg-ref.png		\
+	smask-paint-svg12-ref.png	\
+	smask-paint-svg11-ref.png	\
 	smask-stroke-ref.png		\
 	smask-stroke-pdf-ref.png	\
 	smask-text-ref.png		\
 	smask-text-pdf-ref.png		\
 	smask-text-ps-ref.png		\
-	smask-text-svg-ref.png		\
+	smask-text-svg12-ref.png	\
+	smask-text-svg11-ref.png	\
 	stroke-image-ref.png \
 	stroke-image-pdf-ref.png \
 	stroke-image-ps-ref.png \
@@ -693,7 +709,8 @@ REFERENCE_IMAGES = \
 	source-clip-scale-ps-argb32-ref.png	\
 	source-clip-scale-ps-rgb24-ref.png	\
 	source-clip-scale-ref.png	\
-	source-clip-scale-svg-ref.png	\
+	source-clip-scale-svg12-ref.png	\
+	source-clip-scale-svg11-ref.png	\
 	source-clip-scale-pdf-ref.png \
 	source-surface-scale-paint-ref.png	\
 	source-surface-scale-paint-rgb24-ref.png	\
@@ -709,7 +726,8 @@ REFERENCE_IMAGES = \
 	surface-pattern-scale-up-pdf-argb32-ref.png	\
 	surface-pattern-scale-up-ps-argb32-ref.png	\
 	surface-pattern-scale-up-ref.png	\
-	surface-pattern-svg-ref.png	\
+	surface-pattern-svg12-ref.png	\
+	surface-pattern-svg11-ref.png	\
 	svg-surface-source-ref.png \
 	text-antialias-gray-ref.png	\
 	text-antialias-gray-quartz-ref.png	\
@@ -732,7 +750,8 @@ REFERENCE_IMAGES = \
 	text-rotate-ref.png	\
 	text-rotate-pdf-ref.png \
 	text-rotate-ps-ref.png	\
-	text-rotate-svg-ref.png	\
+	text-rotate-svg12-ref.png \
+	text-rotate-svg11-ref.png \
 	text-rotate-quartz-ref.png \
 	text-transform-ref.png		\
 	text-transform-pdf-ref.png	\
@@ -754,14 +773,17 @@ REFERENCE_IMAGES = \
 	unbounded-operator-rgb24-ref.png	\
 	user-font-ref.png	\
 	user-font-ps-ref.png \
-	user-font-svg-ref.png	\
+	user-font-svg12-ref.png	\
+	user-font-svg11-ref.png	\
 	user-font-proxy-ref.png	\
 	user-font-proxy-pdf-ref.png	\
 	user-font-proxy-ps-ref.png	\
-	user-font-proxy-svg-ref.png	\
+	user-font-proxy-svg12-ref.png	\
+	user-font-proxy-svg11-ref.png	\
 	user-font-rescale-ref.png	\
 	user-font-rescale-ps-ref.png	\
-	user-font-rescale-svg-ref.png	\
+	user-font-rescale-svg12-ref.png	\
+	user-font-rescale-svg11-ref.png	\
 	unbounded-operator-quartz-ref.png	\
 	unbounded-operator-quartz-rgb24-ref.png	\
 	xlib-expose-event-ref.png \
diff --git a/test/caps-joins-alpha-svg-ref.png b/test/caps-joins-alpha-svg-ref.png
deleted file mode 100644
index 2468936..0000000
Binary files a/test/caps-joins-alpha-svg-ref.png and /dev/null differ
diff --git a/test/caps-joins-alpha-svg11-ref.png b/test/caps-joins-alpha-svg11-ref.png
new file mode 100644
index 0000000..2468936
Binary files /dev/null and b/test/caps-joins-alpha-svg11-ref.png differ
diff --git a/test/caps-joins-alpha-svg12-ref.png b/test/caps-joins-alpha-svg12-ref.png
new file mode 100644
index 0000000..2468936
Binary files /dev/null and b/test/caps-joins-alpha-svg12-ref.png differ
diff --git a/test/font-matrix-translation-svg-ref.png b/test/font-matrix-translation-svg-ref.png
deleted file mode 100644
index 92ad17b..0000000
Binary files a/test/font-matrix-translation-svg-ref.png and /dev/null differ
diff --git a/test/font-matrix-translation-svg11-ref.png b/test/font-matrix-translation-svg11-ref.png
new file mode 100644
index 0000000..92ad17b
Binary files /dev/null and b/test/font-matrix-translation-svg11-ref.png differ
diff --git a/test/font-matrix-translation-svg12-ref.png b/test/font-matrix-translation-svg12-ref.png
new file mode 100644
index 0000000..92ad17b
Binary files /dev/null and b/test/font-matrix-translation-svg12-ref.png differ
diff --git a/test/ft-show-glyphs-positioning-svg-ref.png b/test/ft-show-glyphs-positioning-svg-ref.png
deleted file mode 100644
index 43b83cb..0000000
Binary files a/test/ft-show-glyphs-positioning-svg-ref.png and /dev/null differ
diff --git a/test/ft-show-glyphs-positioning-svg11-ref.png b/test/ft-show-glyphs-positioning-svg11-ref.png
new file mode 100644
index 0000000..43b83cb
Binary files /dev/null and b/test/ft-show-glyphs-positioning-svg11-ref.png differ
diff --git a/test/ft-show-glyphs-positioning-svg12-ref.png b/test/ft-show-glyphs-positioning-svg12-ref.png
new file mode 100644
index 0000000..43b83cb
Binary files /dev/null and b/test/ft-show-glyphs-positioning-svg12-ref.png differ
diff --git a/test/ft-text-vertical-layout-type1-svg-ref.png b/test/ft-text-vertical-layout-type1-svg-ref.png
deleted file mode 100644
index 4ad4268..0000000
Binary files a/test/ft-text-vertical-layout-type1-svg-ref.png and /dev/null differ
diff --git a/test/ft-text-vertical-layout-type1-svg11-ref.png b/test/ft-text-vertical-layout-type1-svg11-ref.png
new file mode 100644
index 0000000..4ad4268
Binary files /dev/null and b/test/ft-text-vertical-layout-type1-svg11-ref.png differ
diff --git a/test/ft-text-vertical-layout-type1-svg12-ref.png b/test/ft-text-vertical-layout-type1-svg12-ref.png
new file mode 100644
index 0000000..4ad4268
Binary files /dev/null and b/test/ft-text-vertical-layout-type1-svg12-ref.png differ
diff --git a/test/ft-text-vertical-layout-type3-svg-ref.png b/test/ft-text-vertical-layout-type3-svg-ref.png
deleted file mode 100644
index 7aa322d..0000000
Binary files a/test/ft-text-vertical-layout-type3-svg-ref.png and /dev/null differ
diff --git a/test/ft-text-vertical-layout-type3-svg11-ref.png b/test/ft-text-vertical-layout-type3-svg11-ref.png
new file mode 100644
index 0000000..7aa322d
Binary files /dev/null and b/test/ft-text-vertical-layout-type3-svg11-ref.png differ
diff --git a/test/ft-text-vertical-layout-type3-svg12-ref.png b/test/ft-text-vertical-layout-type3-svg12-ref.png
new file mode 100644
index 0000000..7aa322d
Binary files /dev/null and b/test/ft-text-vertical-layout-type3-svg12-ref.png differ
diff --git a/test/linear-gradient-svg-ref.png b/test/linear-gradient-svg-ref.png
deleted file mode 100644
index 4ed4bfa..0000000
Binary files a/test/linear-gradient-svg-ref.png and /dev/null differ
diff --git a/test/linear-gradient-svg11-ref.png b/test/linear-gradient-svg11-ref.png
new file mode 100644
index 0000000..4ed4bfa
Binary files /dev/null and b/test/linear-gradient-svg11-ref.png differ
diff --git a/test/linear-gradient-svg12-ref.png b/test/linear-gradient-svg12-ref.png
new file mode 100644
index 0000000..4ed4bfa
Binary files /dev/null and b/test/linear-gradient-svg12-ref.png differ
diff --git a/test/mask-alpha-svg-argb32-ref.png b/test/mask-alpha-svg-argb32-ref.png
deleted file mode 100644
index 3e56aa3..0000000
Binary files a/test/mask-alpha-svg-argb32-ref.png and /dev/null differ
diff --git a/test/mask-alpha-svg11-argb32-ref.png b/test/mask-alpha-svg11-argb32-ref.png
new file mode 100644
index 0000000..3e56aa3
Binary files /dev/null and b/test/mask-alpha-svg11-argb32-ref.png differ
diff --git a/test/mask-alpha-svg12-argb32-ref.png b/test/mask-alpha-svg12-argb32-ref.png
new file mode 100644
index 0000000..3e56aa3
Binary files /dev/null and b/test/mask-alpha-svg12-argb32-ref.png differ
diff --git a/test/mask-ctm-svg-argb32-ref.png b/test/mask-ctm-svg-argb32-ref.png
deleted file mode 100644
index 049d5f0..0000000
Binary files a/test/mask-ctm-svg-argb32-ref.png and /dev/null differ
diff --git a/test/mask-ctm-svg11-argb32-ref.png b/test/mask-ctm-svg11-argb32-ref.png
new file mode 100644
index 0000000..049d5f0
Binary files /dev/null and b/test/mask-ctm-svg11-argb32-ref.png differ
diff --git a/test/mask-ctm-svg12-argb32-ref.png b/test/mask-ctm-svg12-argb32-ref.png
new file mode 100644
index 0000000..049d5f0
Binary files /dev/null and b/test/mask-ctm-svg12-argb32-ref.png differ
diff --git a/test/mask-surface-ctm-svg-argb32-ref.png b/test/mask-surface-ctm-svg-argb32-ref.png
deleted file mode 100644
index 049d5f0..0000000
Binary files a/test/mask-surface-ctm-svg-argb32-ref.png and /dev/null differ
diff --git a/test/mask-surface-ctm-svg11-argb32-ref.png b/test/mask-surface-ctm-svg11-argb32-ref.png
new file mode 100644
index 0000000..049d5f0
Binary files /dev/null and b/test/mask-surface-ctm-svg11-argb32-ref.png differ
diff --git a/test/mask-surface-ctm-svg12-argb32-ref.png b/test/mask-surface-ctm-svg12-argb32-ref.png
new file mode 100644
index 0000000..049d5f0
Binary files /dev/null and b/test/mask-surface-ctm-svg12-argb32-ref.png differ
diff --git a/test/mask-svg-argb32-ref.png b/test/mask-svg-argb32-ref.png
deleted file mode 100644
index c582859..0000000
Binary files a/test/mask-svg-argb32-ref.png and /dev/null differ
diff --git a/test/mask-svg-rgb24-ref.png b/test/mask-svg-rgb24-ref.png
deleted file mode 100644
index 7995723..0000000
Binary files a/test/mask-svg-rgb24-ref.png and /dev/null differ
diff --git a/test/mask-svg11-argb32-ref.png b/test/mask-svg11-argb32-ref.png
new file mode 100644
index 0000000..c582859
Binary files /dev/null and b/test/mask-svg11-argb32-ref.png differ
diff --git a/test/mask-svg11-rgb24-ref.png b/test/mask-svg11-rgb24-ref.png
new file mode 100644
index 0000000..7995723
Binary files /dev/null and b/test/mask-svg11-rgb24-ref.png differ
diff --git a/test/mask-svg12-argb32-ref.png b/test/mask-svg12-argb32-ref.png
new file mode 100644
index 0000000..c582859
Binary files /dev/null and b/test/mask-svg12-argb32-ref.png differ
diff --git a/test/mask-svg12-rgb24-ref.png b/test/mask-svg12-rgb24-ref.png
new file mode 100644
index 0000000..7995723
Binary files /dev/null and b/test/mask-svg12-rgb24-ref.png differ
diff --git a/test/mask-transformed-similar-svg-ref.png b/test/mask-transformed-similar-svg-ref.png
deleted file mode 100644
index b4344cd..0000000
Binary files a/test/mask-transformed-similar-svg-ref.png and /dev/null differ
diff --git a/test/mask-transformed-similar-svg11-ref.png b/test/mask-transformed-similar-svg11-ref.png
new file mode 100644
index 0000000..b4344cd
Binary files /dev/null and b/test/mask-transformed-similar-svg11-ref.png differ
diff --git a/test/mask-transformed-similar-svg12-ref.png b/test/mask-transformed-similar-svg12-ref.png
new file mode 100644
index 0000000..b4344cd
Binary files /dev/null and b/test/mask-transformed-similar-svg12-ref.png differ
diff --git a/test/meta-surface-pattern-svg-argb32-ref.png b/test/meta-surface-pattern-svg-argb32-ref.png
deleted file mode 100644
index 6250f26..0000000
Binary files a/test/meta-surface-pattern-svg-argb32-ref.png and /dev/null differ
diff --git a/test/meta-surface-pattern-svg-rgb24-ref.png b/test/meta-surface-pattern-svg-rgb24-ref.png
deleted file mode 100644
index feda67d..0000000
Binary files a/test/meta-surface-pattern-svg-rgb24-ref.png and /dev/null differ
diff --git a/test/meta-surface-pattern-svg11-argb32-ref.png b/test/meta-surface-pattern-svg11-argb32-ref.png
new file mode 100644
index 0000000..6250f26
Binary files /dev/null and b/test/meta-surface-pattern-svg11-argb32-ref.png differ
diff --git a/test/meta-surface-pattern-svg11-rgb24-ref.png b/test/meta-surface-pattern-svg11-rgb24-ref.png
new file mode 100644
index 0000000..feda67d
Binary files /dev/null and b/test/meta-surface-pattern-svg11-rgb24-ref.png differ
diff --git a/test/meta-surface-pattern-svg12-argb32-ref.png b/test/meta-surface-pattern-svg12-argb32-ref.png
new file mode 100644
index 0000000..6250f26
Binary files /dev/null and b/test/meta-surface-pattern-svg12-argb32-ref.png differ
diff --git a/test/meta-surface-pattern-svg12-rgb24-ref.png b/test/meta-surface-pattern-svg12-rgb24-ref.png
new file mode 100644
index 0000000..feda67d
Binary files /dev/null and b/test/meta-surface-pattern-svg12-rgb24-ref.png differ
diff --git a/test/paint-source-alpha-svg-ref.png b/test/paint-source-alpha-svg-ref.png
deleted file mode 100644
index 3b3a990..0000000
Binary files a/test/paint-source-alpha-svg-ref.png and /dev/null differ
diff --git a/test/paint-source-alpha-svg11-ref.png b/test/paint-source-alpha-svg11-ref.png
new file mode 100644
index 0000000..3b3a990
Binary files /dev/null and b/test/paint-source-alpha-svg11-ref.png differ
diff --git a/test/paint-source-alpha-svg12-ref.png b/test/paint-source-alpha-svg12-ref.png
new file mode 100644
index 0000000..3b3a990
Binary files /dev/null and b/test/paint-source-alpha-svg12-ref.png differ
diff --git a/test/paint-with-alpha-svg-ref.png b/test/paint-with-alpha-svg-ref.png
deleted file mode 100644
index 97a2100..0000000
Binary files a/test/paint-with-alpha-svg-ref.png and /dev/null differ
diff --git a/test/paint-with-alpha-svg11-ref.png b/test/paint-with-alpha-svg11-ref.png
new file mode 100644
index 0000000..97a2100
Binary files /dev/null and b/test/paint-with-alpha-svg11-ref.png differ
diff --git a/test/paint-with-alpha-svg12-ref.png b/test/paint-with-alpha-svg12-ref.png
new file mode 100644
index 0000000..97a2100
Binary files /dev/null and b/test/paint-with-alpha-svg12-ref.png differ
diff --git a/test/push-group-svg-argb32-ref.png b/test/push-group-svg-argb32-ref.png
deleted file mode 100644
index 34f06bf..0000000
Binary files a/test/push-group-svg-argb32-ref.png and /dev/null differ
diff --git a/test/push-group-svg11-argb32-ref.png b/test/push-group-svg11-argb32-ref.png
new file mode 100644
index 0000000..34f06bf
Binary files /dev/null and b/test/push-group-svg11-argb32-ref.png differ
diff --git a/test/push-group-svg12-argb32-ref.png b/test/push-group-svg12-argb32-ref.png
new file mode 100644
index 0000000..34f06bf
Binary files /dev/null and b/test/push-group-svg12-argb32-ref.png differ
diff --git a/test/radial-gradient-svg-ref.png b/test/radial-gradient-svg-ref.png
deleted file mode 100644
index 7e04701..0000000
Binary files a/test/radial-gradient-svg-ref.png and /dev/null differ
diff --git a/test/radial-gradient-svg11-ref.png b/test/radial-gradient-svg11-ref.png
new file mode 100644
index 0000000..7e04701
Binary files /dev/null and b/test/radial-gradient-svg11-ref.png differ
diff --git a/test/radial-gradient-svg12-ref.png b/test/radial-gradient-svg12-ref.png
new file mode 100644
index 0000000..7e04701
Binary files /dev/null and b/test/radial-gradient-svg12-ref.png differ
diff --git a/test/rotate-image-surface-paint-svg-ref.png b/test/rotate-image-surface-paint-svg-ref.png
deleted file mode 100644
index 5a75aef..0000000
Binary files a/test/rotate-image-surface-paint-svg-ref.png and /dev/null differ
diff --git a/test/rotate-image-surface-paint-svg11-ref.png b/test/rotate-image-surface-paint-svg11-ref.png
new file mode 100644
index 0000000..5a75aef
Binary files /dev/null and b/test/rotate-image-surface-paint-svg11-ref.png differ
diff --git a/test/rotate-image-surface-paint-svg12-ref.png b/test/rotate-image-surface-paint-svg12-ref.png
new file mode 100644
index 0000000..5a75aef
Binary files /dev/null and b/test/rotate-image-surface-paint-svg12-ref.png differ
diff --git a/test/scale-source-surface-paint-svg-argb32-ref.png b/test/scale-source-surface-paint-svg-argb32-ref.png
deleted file mode 100644
index de274f9..0000000
Binary files a/test/scale-source-surface-paint-svg-argb32-ref.png and /dev/null differ
diff --git a/test/scale-source-surface-paint-svg-rgb24-ref.png b/test/scale-source-surface-paint-svg-rgb24-ref.png
deleted file mode 100644
index 099b8a0..0000000
Binary files a/test/scale-source-surface-paint-svg-rgb24-ref.png and /dev/null differ
diff --git a/test/scale-source-surface-paint-svg11-argb32-ref.png b/test/scale-source-surface-paint-svg11-argb32-ref.png
new file mode 100644
index 0000000..de274f9
Binary files /dev/null and b/test/scale-source-surface-paint-svg11-argb32-ref.png differ
diff --git a/test/scale-source-surface-paint-svg11-rgb24-ref.png b/test/scale-source-surface-paint-svg11-rgb24-ref.png
new file mode 100644
index 0000000..099b8a0
Binary files /dev/null and b/test/scale-source-surface-paint-svg11-rgb24-ref.png differ
diff --git a/test/scale-source-surface-paint-svg12-argb32-ref.png b/test/scale-source-surface-paint-svg12-argb32-ref.png
new file mode 100644
index 0000000..de274f9
Binary files /dev/null and b/test/scale-source-surface-paint-svg12-argb32-ref.png differ
diff --git a/test/scale-source-surface-paint-svg12-rgb24-ref.png b/test/scale-source-surface-paint-svg12-rgb24-ref.png
new file mode 100644
index 0000000..099b8a0
Binary files /dev/null and b/test/scale-source-surface-paint-svg12-rgb24-ref.png differ
diff --git a/test/set-source-svg-argb32-ref.png b/test/set-source-svg-argb32-ref.png
deleted file mode 100644
index 754f1c4..0000000
Binary files a/test/set-source-svg-argb32-ref.png and /dev/null differ
diff --git a/test/set-source-svg11-argb32-ref.png b/test/set-source-svg11-argb32-ref.png
new file mode 100644
index 0000000..754f1c4
Binary files /dev/null and b/test/set-source-svg11-argb32-ref.png differ
diff --git a/test/set-source-svg12-argb32-ref.png b/test/set-source-svg12-argb32-ref.png
new file mode 100644
index 0000000..754f1c4
Binary files /dev/null and b/test/set-source-svg12-argb32-ref.png differ
diff --git a/test/smask-fill-svg-ref.png b/test/smask-fill-svg-ref.png
deleted file mode 100644
index 06ab12a..0000000
Binary files a/test/smask-fill-svg-ref.png and /dev/null differ
diff --git a/test/smask-fill-svg11-ref.png b/test/smask-fill-svg11-ref.png
new file mode 100644
index 0000000..06ab12a
Binary files /dev/null and b/test/smask-fill-svg11-ref.png differ
diff --git a/test/smask-fill-svg12-ref.png b/test/smask-fill-svg12-ref.png
new file mode 100644
index 0000000..06ab12a
Binary files /dev/null and b/test/smask-fill-svg12-ref.png differ
diff --git a/test/smask-mask-svg-ref.png b/test/smask-mask-svg-ref.png
deleted file mode 100644
index 0820cd1..0000000
Binary files a/test/smask-mask-svg-ref.png and /dev/null differ
diff --git a/test/smask-mask-svg11-ref.png b/test/smask-mask-svg11-ref.png
new file mode 100644
index 0000000..0820cd1
Binary files /dev/null and b/test/smask-mask-svg11-ref.png differ
diff --git a/test/smask-mask-svg12-ref.png b/test/smask-mask-svg12-ref.png
new file mode 100644
index 0000000..0820cd1
Binary files /dev/null and b/test/smask-mask-svg12-ref.png differ
diff --git a/test/smask-paint-svg-ref.png b/test/smask-paint-svg-ref.png
deleted file mode 100644
index 09c01de..0000000
Binary files a/test/smask-paint-svg-ref.png and /dev/null differ
diff --git a/test/smask-paint-svg11-ref.png b/test/smask-paint-svg11-ref.png
new file mode 100644
index 0000000..09c01de
Binary files /dev/null and b/test/smask-paint-svg11-ref.png differ
diff --git a/test/smask-paint-svg12-ref.png b/test/smask-paint-svg12-ref.png
new file mode 100644
index 0000000..09c01de
Binary files /dev/null and b/test/smask-paint-svg12-ref.png differ
diff --git a/test/smask-svg-ref.png b/test/smask-svg-ref.png
deleted file mode 100644
index f188561..0000000
Binary files a/test/smask-svg-ref.png and /dev/null differ
diff --git a/test/smask-svg11-ref.png b/test/smask-svg11-ref.png
new file mode 100644
index 0000000..f188561
Binary files /dev/null and b/test/smask-svg11-ref.png differ
diff --git a/test/smask-svg12-ref.png b/test/smask-svg12-ref.png
new file mode 100644
index 0000000..f188561
Binary files /dev/null and b/test/smask-svg12-ref.png differ
diff --git a/test/smask-text-svg-ref.png b/test/smask-text-svg-ref.png
deleted file mode 100644
index 2665370..0000000
Binary files a/test/smask-text-svg-ref.png and /dev/null differ
diff --git a/test/smask-text-svg11-ref.png b/test/smask-text-svg11-ref.png
new file mode 100644
index 0000000..2665370
Binary files /dev/null and b/test/smask-text-svg11-ref.png differ
diff --git a/test/smask-text-svg12-ref.png b/test/smask-text-svg12-ref.png
new file mode 100644
index 0000000..2665370
Binary files /dev/null and b/test/smask-text-svg12-ref.png differ
diff --git a/test/source-clip-scale-svg-ref.png b/test/source-clip-scale-svg-ref.png
deleted file mode 100644
index 87c2917..0000000
Binary files a/test/source-clip-scale-svg-ref.png and /dev/null differ
diff --git a/test/source-clip-scale-svg11-ref.png b/test/source-clip-scale-svg11-ref.png
new file mode 100644
index 0000000..87c2917
Binary files /dev/null and b/test/source-clip-scale-svg11-ref.png differ
diff --git a/test/source-clip-scale-svg12-ref.png b/test/source-clip-scale-svg12-ref.png
new file mode 100644
index 0000000..87c2917
Binary files /dev/null and b/test/source-clip-scale-svg12-ref.png differ
diff --git a/test/surface-pattern-svg-ref.png b/test/surface-pattern-svg-ref.png
deleted file mode 100644
index 5569a55..0000000
Binary files a/test/surface-pattern-svg-ref.png and /dev/null differ
diff --git a/test/surface-pattern-svg11-ref.png b/test/surface-pattern-svg11-ref.png
new file mode 100644
index 0000000..5569a55
Binary files /dev/null and b/test/surface-pattern-svg11-ref.png differ
diff --git a/test/surface-pattern-svg12-ref.png b/test/surface-pattern-svg12-ref.png
new file mode 100644
index 0000000..5569a55
Binary files /dev/null and b/test/surface-pattern-svg12-ref.png differ
diff --git a/test/text-pattern-svg-argb32-ref.png b/test/text-pattern-svg-argb32-ref.png
deleted file mode 100644
index 97d7534..0000000
Binary files a/test/text-pattern-svg-argb32-ref.png and /dev/null differ
diff --git a/test/text-pattern-svg-rgb24-ref.png b/test/text-pattern-svg-rgb24-ref.png
deleted file mode 100644
index c1f76c2..0000000
Binary files a/test/text-pattern-svg-rgb24-ref.png and /dev/null differ
diff --git a/test/text-pattern-svg11-argb32-ref.png b/test/text-pattern-svg11-argb32-ref.png
new file mode 100644
index 0000000..97d7534
Binary files /dev/null and b/test/text-pattern-svg11-argb32-ref.png differ
diff --git a/test/text-pattern-svg11-rgb24-ref.png b/test/text-pattern-svg11-rgb24-ref.png
new file mode 100644
index 0000000..c1f76c2
Binary files /dev/null and b/test/text-pattern-svg11-rgb24-ref.png differ
diff --git a/test/text-pattern-svg12-argb32-ref.png b/test/text-pattern-svg12-argb32-ref.png
new file mode 100644
index 0000000..97d7534
Binary files /dev/null and b/test/text-pattern-svg12-argb32-ref.png differ
diff --git a/test/text-pattern-svg12-rgb24-ref.png b/test/text-pattern-svg12-rgb24-ref.png
new file mode 100644
index 0000000..c1f76c2
Binary files /dev/null and b/test/text-pattern-svg12-rgb24-ref.png differ
diff --git a/test/text-rotate-svg-ref.png b/test/text-rotate-svg-ref.png
deleted file mode 100644
index 35fd019..0000000
Binary files a/test/text-rotate-svg-ref.png and /dev/null differ
diff --git a/test/text-rotate-svg11-ref.png b/test/text-rotate-svg11-ref.png
new file mode 100644
index 0000000..35fd019
Binary files /dev/null and b/test/text-rotate-svg11-ref.png differ
diff --git a/test/text-rotate-svg12-ref.png b/test/text-rotate-svg12-ref.png
new file mode 100644
index 0000000..35fd019
Binary files /dev/null and b/test/text-rotate-svg12-ref.png differ
diff --git a/test/user-font-proxy-svg-ref.png b/test/user-font-proxy-svg-ref.png
deleted file mode 100644
index e5e9e9a..0000000
Binary files a/test/user-font-proxy-svg-ref.png and /dev/null differ
diff --git a/test/user-font-proxy-svg11-ref.png b/test/user-font-proxy-svg11-ref.png
new file mode 100644
index 0000000..e5e9e9a
Binary files /dev/null and b/test/user-font-proxy-svg11-ref.png differ
diff --git a/test/user-font-proxy-svg12-ref.png b/test/user-font-proxy-svg12-ref.png
new file mode 100644
index 0000000..e5e9e9a
Binary files /dev/null and b/test/user-font-proxy-svg12-ref.png differ
diff --git a/test/user-font-rescale-svg-ref.png b/test/user-font-rescale-svg-ref.png
deleted file mode 100644
index 871e27e..0000000
Binary files a/test/user-font-rescale-svg-ref.png and /dev/null differ
diff --git a/test/user-font-rescale-svg11-ref.png b/test/user-font-rescale-svg11-ref.png
new file mode 100644
index 0000000..871e27e
Binary files /dev/null and b/test/user-font-rescale-svg11-ref.png differ
diff --git a/test/user-font-rescale-svg12-ref.png b/test/user-font-rescale-svg12-ref.png
new file mode 100644
index 0000000..871e27e
Binary files /dev/null and b/test/user-font-rescale-svg12-ref.png differ
diff --git a/test/user-font-svg-ref.png b/test/user-font-svg-ref.png
deleted file mode 100644
index 28ba652..0000000
Binary files a/test/user-font-svg-ref.png and /dev/null differ
diff --git a/test/user-font-svg11-ref.png b/test/user-font-svg11-ref.png
new file mode 100644
index 0000000..28ba652
Binary files /dev/null and b/test/user-font-svg11-ref.png differ
diff --git a/test/user-font-svg12-ref.png b/test/user-font-svg12-ref.png
new file mode 100644
index 0000000..28ba652
Binary files /dev/null and b/test/user-font-svg12-ref.png differ


More information about the cairo-commit mailing list