[cairo-commit] 2 commits - test/cairo-test.h test/clip-all.c test/clip-empty.c test/clip-empty-save.c test/clip-operator.c test/font-face-get-type.c test/font-matrix-translation.c test/ft-show-glyphs-positioning.c test/ft-show-glyphs-table.c test/ft-text-antialias-none.c test/ft-text-vertical-layout-type3.c test/get-path-extents.c test/glyph-cache-pressure.c test/inverse-text.c test/large-font.c test/operator-clear.c test/operator-source.c test/overlapping-glyphs.c test/pdf-features.c test/ps-features.c test/README test/select-font-face.c test/select-font-no-show-text.c test/show-text-current-point.c test/smask.c test/smask-text.c test/text-antialias-gray.c test/text-antialias-none.c test/text-antialias-subpixel.c test/text-glyph-range.c test/text-pattern.c test/text-rotate.c test/text-transform.c test/text-zero-len.c test/unbounded-operator.c test/user-font-rescale.c
Andrea Canciani
ranma42 at kemper.freedesktop.org
Sat Jun 12 07:31:01 PDT 2010
test/README | 10 +++++-----
test/cairo-test.h | 2 ++
test/clip-all.c | 2 +-
test/clip-empty-save.c | 2 +-
test/clip-empty.c | 2 +-
test/clip-operator.c | 2 +-
test/font-face-get-type.c | 2 +-
test/font-matrix-translation.c | 2 +-
test/ft-show-glyphs-positioning.c | 2 +-
test/ft-show-glyphs-table.c | 2 +-
test/ft-text-antialias-none.c | 2 +-
test/ft-text-vertical-layout-type3.c | 2 +-
test/get-path-extents.c | 2 +-
test/glyph-cache-pressure.c | 2 +-
test/inverse-text.c | 6 +++---
test/large-font.c | 2 +-
test/operator-clear.c | 2 +-
test/operator-source.c | 2 +-
test/overlapping-glyphs.c | 2 +-
test/pdf-features.c | 2 +-
test/ps-features.c | 2 +-
test/select-font-face.c | 6 +++---
test/select-font-no-show-text.c | 2 +-
test/show-text-current-point.c | 2 +-
test/smask-text.c | 2 +-
test/smask.c | 2 +-
test/text-antialias-gray.c | 2 +-
test/text-antialias-none.c | 2 +-
test/text-antialias-subpixel.c | 2 +-
test/text-glyph-range.c | 2 +-
test/text-pattern.c | 2 +-
test/text-rotate.c | 2 +-
test/text-transform.c | 2 +-
test/text-zero-len.c | 2 +-
test/unbounded-operator.c | 2 +-
test/user-font-rescale.c | 6 +++---
36 files changed, 47 insertions(+), 45 deletions(-)
New commits:
commit e6d1b3a8ce0b516aed7715b57d9ca5ab4fad6c2f
Author: Andrea Canciani <ranma42 at gmail.com>
Date: Sat Jun 12 16:22:54 2010 +0200
test: update font family name
Update the name of the test font family to DejaVu, so that backends
unable to rely on fontconfig to match font names can find the correct
font anyway.
diff --git a/test/README b/test/README
index 4a1f937..0cd3433 100644
--- a/test/README
+++ b/test/README
@@ -94,12 +94,12 @@ the software configuration used to generate the reference images.
Here are some of the relevant details:
- * Your system must have a copy of the Bitstream Vera font, the sha1sum of
+ * Your system must have a copy of the DejaVu font, the sha1sum of
the version used are listed in [...]. These are
- "Bitstream Vera Sans" (DejaVuSans.ttf) [682718dd37c3f6a4767386d3b2b27fba9b219818];
- "Bitstream Vera Sans Mono" (DejaVuSansMono.ttf) [1cc58255d6f9df2b08e760ca38937a2957153484];
- "Bitstream Vera Serif" (DejaVuSerif.ttf) [020e72e92cb2f66107dc18c70ac4214df4f13014];
- [the Bitstream fonts can be installed from the ttf-dejavu Debian package]
+ "DejaVu Sans" (DejaVuSans.ttf) [682718dd37c3f6a4767386d3b2b27fba9b219818];
+ "DejaVu Sans Mono" (DejaVuSansMono.ttf) [1cc58255d6f9df2b08e760ca38937a2957153484];
+ "DejaVu Serif" (DejaVuSerif.ttf) [020e72e92cb2f66107dc18c70ac4214df4f13014];
+ [the DejaVu fonts can be installed from the ttf-dejavu Debian package]
and also
"Nimbus Sans L" (n019003l.pfb)
[which can be found in the gsfonts Debian package].
diff --git a/test/cairo-test.h b/test/cairo-test.h
index a2af43d..c7abd3d 100644
--- a/test/cairo-test.h
+++ b/test/cairo-test.h
@@ -83,7 +83,7 @@ cairo_test_NaN (void)
#define CAIRO_TEST_LOG_SUFFIX ".log"
-#define CAIRO_TEST_FONT_FAMILY "Bitstream Vera"
+#define CAIRO_TEST_FONT_FAMILY "DejaVu"
/* What is a fail and what isn't?
* When running the test suite we want to detect unexpected output. This
commit 3cb882d01b53cb3cec9be62d678dd4ef7ea2c1fd
Author: Andrea Canciani <ranma42 at gmail.com>
Date: Sat Jun 12 16:20:37 2010 +0200
test: make test font family a define
In order to make it easier to change the test font family, add it
as a define in the global header and always reference the macro in
the tests.
diff --git a/test/cairo-test.h b/test/cairo-test.h
index e2bf1a7..a2af43d 100644
--- a/test/cairo-test.h
+++ b/test/cairo-test.h
@@ -83,6 +83,8 @@ cairo_test_NaN (void)
#define CAIRO_TEST_LOG_SUFFIX ".log"
+#define CAIRO_TEST_FONT_FAMILY "Bitstream Vera"
+
/* What is a fail and what isn't?
* When running the test suite we want to detect unexpected output. This
* can be caused by a change we have made to cairo itself, or a change
diff --git a/test/clip-all.c b/test/clip-all.c
index 3e7d24e..dc216c9 100644
--- a/test/clip-all.c
+++ b/test/clip-all.c
@@ -55,7 +55,7 @@ draw (cairo_t *cr, int width, int height)
/* https://bugs.freedesktop.org/show_bug.cgi?id=13084 */
cairo_select_font_face (cr,
- "Bitstream Vera Sans",
+ CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/clip-empty-save.c b/test/clip-empty-save.c
index 9f8fd69..35de3cb 100644
--- a/test/clip-empty-save.c
+++ b/test/clip-empty-save.c
@@ -48,7 +48,7 @@ draw (cairo_t *cr, int width, int height)
/* https://bugs.freedesktop.org/show_bug.cgi?id=13084 */
cairo_select_font_face (cr,
- "Bitstream Vera Sans",
+ CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/clip-empty.c b/test/clip-empty.c
index f6848e5..858b69a 100644
--- a/test/clip-empty.c
+++ b/test/clip-empty.c
@@ -46,7 +46,7 @@ draw (cairo_t *cr, int width, int height)
/* https://bugs.freedesktop.org/show_bug.cgi?id=13084 */
cairo_select_font_face (cr,
- "Bitstream Vera Sans",
+ CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/clip-operator.c b/test/clip-operator.c
index a6562a8..ec437e0 100644
--- a/test/clip-operator.c
+++ b/test/clip-operator.c
@@ -134,7 +134,7 @@ draw (cairo_t *cr, int width, int height)
cairo_operator_t op;
cairo_pattern_t *pattern;
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, 0.9 * HEIGHT);
diff --git a/test/font-face-get-type.c b/test/font-face-get-type.c
index 05a763d..afbb739 100644
--- a/test/font-face-get-type.c
+++ b/test/font-face-get-type.c
@@ -39,7 +39,7 @@ preamble (cairo_test_context_t *ctx)
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 1, 1);
cr = cairo_create (surface);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/font-matrix-translation.c b/test/font-matrix-translation.c
index b83a527..465ac7c 100644
--- a/test/font-matrix-translation.c
+++ b/test/font-matrix-translation.c
@@ -102,7 +102,7 @@ draw (cairo_t *cr, int width, int height)
cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
cairo_paint (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/ft-show-glyphs-positioning.c b/test/ft-show-glyphs-positioning.c
index 64f6d3c..449f8eb 100644
--- a/test/ft-show-glyphs-positioning.c
+++ b/test/ft-show-glyphs-positioning.c
@@ -130,7 +130,7 @@ draw (cairo_t *cr, int width, int height)
cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
cairo_paint (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/ft-show-glyphs-table.c b/test/ft-show-glyphs-table.c
index e86f149..344392f 100644
--- a/test/ft-show-glyphs-table.c
+++ b/test/ft-show-glyphs-table.c
@@ -70,7 +70,7 @@ draw (cairo_t *cr, int width, int height)
cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
cairo_paint (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/ft-text-antialias-none.c b/test/ft-text-antialias-none.c
index a6ab41c..64eea64 100644
--- a/test/ft-text-antialias-none.c
+++ b/test/ft-text-antialias-none.c
@@ -54,7 +54,7 @@ create_scaled_font (cairo_t * cr,
if (pattern == NULL)
return CAIRO_STATUS_NO_MEMORY;
- FcPatternAddString (pattern, FC_FAMILY, (FcChar8 *)"Bitstream vera sans");
+ FcPatternAddString (pattern, FC_FAMILY, (FcChar8 *) CAIRO_TEST_FONT_FAMILY " Sans");
FcPatternAddDouble (pattern, FC_SIZE, TEXT_SIZE);
FcConfigSubstitute (NULL, pattern, FcMatchPattern);
diff --git a/test/ft-text-vertical-layout-type3.c b/test/ft-text-vertical-layout-type3.c
index 9826806..0cea9dd 100644
--- a/test/ft-text-vertical-layout-type3.c
+++ b/test/ft-text-vertical-layout-type3.c
@@ -54,7 +54,7 @@ create_scaled_font (cairo_t * cr,
if (pattern == NULL)
return CAIRO_STATUS_NO_MEMORY;
- FcPatternAddString (pattern, FC_FAMILY, (FcChar8 *)"Bitstream Vera Sans");
+ FcPatternAddString (pattern, FC_FAMILY, (FcChar8 *)CAIRO_TEST_FONT_FAMILY " Sans");
FcPatternAddDouble (pattern, FC_PIXEL_SIZE, TEXT_SIZE);
FcConfigSubstitute (NULL, pattern, FcMatchPattern);
diff --git a/test/get-path-extents.c b/test/get-path-extents.c
index 337dad2..a3e9554 100644
--- a/test/get-path-extents.c
+++ b/test/get-path-extents.c
@@ -292,7 +292,7 @@ draw (cairo_t *cr, int width, int height)
phase = "Text";
cairo_save (cr2);
- cairo_select_font_face (cr2, "Bitstream Vera Sans",
+ cairo_select_font_face (cr2, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr2, 12);
diff --git a/test/glyph-cache-pressure.c b/test/glyph-cache-pressure.c
index 9b0e3f3..770b39f 100644
--- a/test/glyph-cache-pressure.c
+++ b/test/glyph-cache-pressure.c
@@ -58,7 +58,7 @@ draw (cairo_t *cr, int width, int height)
cairo_paint (cr);
cairo_restore (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/inverse-text.c b/test/inverse-text.c
index 5551220..c8d7aea 100644
--- a/test/inverse-text.c
+++ b/test/inverse-text.c
@@ -41,17 +41,17 @@ draw (cairo_t *cr, int width, int height)
cairo_set_font_size (cr, TEXT_SIZE);
cairo_move_to (cr, 0, TEXT_SIZE);
- cairo_select_font_face (cr, "Bitstream Vera Serif",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Serif",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_show_text (cr, "i-am-serif");
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_show_text (cr, " i-am-sans");
- cairo_select_font_face (cr, "Bitstream Vera Sans Mono",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans Mono",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_show_text (cr, " i-am-mono");
diff --git a/test/large-font.c b/test/large-font.c
index d9ba954..0a13944 100644
--- a/test/large-font.c
+++ b/test/large-font.c
@@ -53,7 +53,7 @@ draw (cairo_t *cr, int width, int height)
cairo_set_source_rgb (cr, 1., 1., 1.);
cairo_paint (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/operator-clear.c b/test/operator-clear.c
index b294dc0..a1cf981 100644
--- a/test/operator-clear.c
+++ b/test/operator-clear.c
@@ -149,7 +149,7 @@ draw (cairo_t *cr, int width, int height)
size_t i, j, x, y;
cairo_pattern_t *pattern;
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/operator-source.c b/test/operator-source.c
index 8d77307..c92b4ad 100644
--- a/test/operator-source.c
+++ b/test/operator-source.c
@@ -186,7 +186,7 @@ draw (cairo_t *cr, int width, int height)
size_t i, j, x, y;
cairo_pattern_t *pattern;
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/overlapping-glyphs.c b/test/overlapping-glyphs.c
index 690a6dd..93067ab 100644
--- a/test/overlapping-glyphs.c
+++ b/test/overlapping-glyphs.c
@@ -48,7 +48,7 @@ draw (cairo_t *cr, int width, int height)
cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
cairo_paint (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/pdf-features.c b/test/pdf-features.c
index cc25fce..31099c9 100644
--- a/test/pdf-features.c
+++ b/test/pdf-features.c
@@ -105,7 +105,7 @@ preamble (cairo_test_context_t *ctx)
cr = cairo_create (surface);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/ps-features.c b/test/ps-features.c
index 72fd21a..c1fb730 100644
--- a/test/ps-features.c
+++ b/test/ps-features.c
@@ -118,7 +118,7 @@ preamble (cairo_test_context_t *ctx)
cr = cairo_create (surface);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/select-font-face.c b/test/select-font-face.c
index 74c1276..ec4b27c 100644
--- a/test/select-font-face.c
+++ b/test/select-font-face.c
@@ -39,17 +39,17 @@ draw (cairo_t *cr, int width, int height)
cairo_set_font_size (cr, TEXT_SIZE);
cairo_move_to (cr, 0, TEXT_SIZE);
- cairo_select_font_face (cr, "Bitstream Vera Serif",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Serif",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_show_text (cr, "i-am-serif");
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_show_text (cr, " i-am-sans");
- cairo_select_font_face (cr, "Bitstream Vera Sans Mono",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans Mono",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_show_text (cr, " i-am-mono");
diff --git a/test/select-font-no-show-text.c b/test/select-font-no-show-text.c
index 63b1eb2..0b72415 100644
--- a/test/select-font-no-show-text.c
+++ b/test/select-font-no-show-text.c
@@ -44,7 +44,7 @@
static cairo_test_status_t
draw (cairo_t *cr, int width, int height)
{
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_BOLD);
diff --git a/test/show-text-current-point.c b/test/show-text-current-point.c
index acf6d1c..2fe32a8 100644
--- a/test/show-text-current-point.c
+++ b/test/show-text-current-point.c
@@ -36,7 +36,7 @@ draw (cairo_t *cr, int width, int height)
cairo_paint (cr);
cairo_restore (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/smask-text.c b/test/smask-text.c
index c00aca4..f36ae26 100644
--- a/test/smask-text.c
+++ b/test/smask-text.c
@@ -57,7 +57,7 @@ draw (cairo_t *cr, int width, int height)
cairo_pattern_destroy (pattern);
cairo_select_font_face (cr2,
- "Bitstream Vera Sans",
+ CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr2, 0.5 * height);
diff --git a/test/smask.c b/test/smask.c
index 867fb69..4cf3adb 100644
--- a/test/smask.c
+++ b/test/smask.c
@@ -82,7 +82,7 @@ draw (cairo_t *cr, int width, int height)
cairo_stroke (cr2);
cairo_select_font_face (cr2,
- "Bitstream Vera Sans",
+ CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr2, 0.3 * height);
diff --git a/test/text-antialias-gray.c b/test/text-antialias-gray.c
index cdc0e06..84143f0 100644
--- a/test/text-antialias-gray.c
+++ b/test/text-antialias-gray.c
@@ -42,7 +42,7 @@ draw (cairo_t *cr, int width, int height)
cairo_paint (cr);
cairo_restore (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/text-antialias-none.c b/test/text-antialias-none.c
index cd43f2a..dbfcdee 100644
--- a/test/text-antialias-none.c
+++ b/test/text-antialias-none.c
@@ -42,7 +42,7 @@ draw (cairo_t *cr, int width, int height)
cairo_paint (cr);
cairo_restore (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/text-antialias-subpixel.c b/test/text-antialias-subpixel.c
index 1a528d6..e6eadc2 100644
--- a/test/text-antialias-subpixel.c
+++ b/test/text-antialias-subpixel.c
@@ -39,7 +39,7 @@ draw (cairo_t *cr, int width, int height)
cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
cairo_paint (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/text-glyph-range.c b/test/text-glyph-range.c
index f6422fe..75b87d6 100644
--- a/test/text-glyph-range.c
+++ b/test/text-glyph-range.c
@@ -69,7 +69,7 @@ draw (cairo_t *cr, int width, int height)
cairo_paint (cr);
cairo_restore (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, 16);
diff --git a/test/text-pattern.c b/test/text-pattern.c
index ad4419d..6508b5e 100644
--- a/test/text-pattern.c
+++ b/test/text-pattern.c
@@ -33,7 +33,7 @@ draw (cairo_t *cr, int width, int height)
{
cairo_pattern_t *pat;
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/text-rotate.c b/test/text-rotate.c
index cbc756c..0a805ac 100644
--- a/test/text-rotate.c
+++ b/test/text-rotate.c
@@ -137,7 +137,7 @@ draw (cairo_t *cr, int width, int height)
cairo_set_source_rgb (cr, 1., 1., 1.);
cairo_paint (cr);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, TEXT_SIZE);
diff --git a/test/text-transform.c b/test/text-transform.c
index e5c0e35..2cd7f10 100644
--- a/test/text-transform.c
+++ b/test/text-transform.c
@@ -77,7 +77,7 @@ draw (cairo_t *cr, int width, int height)
cairo_set_source_rgb (cr, 0., 0., 0.);
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/text-zero-len.c b/test/text-zero-len.c
index 3efb3ef..5e89816 100644
--- a/test/text-zero-len.c
+++ b/test/text-zero-len.c
@@ -74,7 +74,7 @@ draw (cairo_t *cr, int width, int height)
cairo_font_extents_t font_extents, nil_font_extents;
cairo_scaled_font_t *scaled_font;
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size (cr, 16);
diff --git a/test/unbounded-operator.c b/test/unbounded-operator.c
index af1442b..065bff9 100644
--- a/test/unbounded-operator.c
+++ b/test/unbounded-operator.c
@@ -137,7 +137,7 @@ draw (cairo_t *cr, int width, int height)
size_t i, j, x, y;
cairo_pattern_t *pattern;
- cairo_select_font_face (cr, "Bitstream Vera Sans",
+ cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
diff --git a/test/user-font-rescale.c b/test/user-font-rescale.c
index 8d2e897..3fe70f6 100644
--- a/test/user-font-rescale.c
+++ b/test/user-font-rescale.c
@@ -312,7 +312,7 @@ draw (cairo_t *cr, int width, int height)
cairo_paint (cr);
cairo_select_font_face (cr,
- "Bitstream Vera Sans",
+ CAIRO_TEST_FONT_FAMILY " Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
@@ -328,7 +328,7 @@ draw (cairo_t *cr, int width, int height)
/* same text in 'mono' with widths that match the 'sans' version */
old = cairo_font_face_reference (cairo_get_font_face (cr));
cairo_select_font_face (cr,
- "Bitstream Vera Sans Mono",
+ CAIRO_TEST_FONT_FAMILY " Sans Mono",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
substitute = cairo_get_font_face (cr);
@@ -349,7 +349,7 @@ draw (cairo_t *cr, int width, int height)
/* mono text */
cairo_select_font_face (cr,
- "Bitstream Vera Sans Mono",
+ CAIRO_TEST_FONT_FAMILY " Sans Mono",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL);
More information about the cairo-commit
mailing list