[cairo-commit] test/ft-text-vertical-layout-truetype.c
test/ft-text-vertical-layout-truetype-ref.png
test/ft-text-vertical-layout-truetype-svg-ref.png
test/ft-text-vertical-layout-type3.c
test/ft-text-vertical-layout-type3-ref.png
test/ft-text-vertical-layout-type3-svg-ref.png test/Makefile.am
Carl Worth
cworth at kemper.freedesktop.org
Fri Aug 18 13:09:20 PDT 2006
test/Makefile.am | 8 +++-----
test/ft-text-vertical-layout-type3.c | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
diff-tree 84a9ca1835998a11b78f5989ce927166c2baa00f (from aa2260cfbbf5fd5c923409962814c6795e5ecc41)
Author: Carl Worth <cworth at cworth.org>
Date: Fri Aug 18 13:07:08 2006 -0700
Rename ft-text-vertical-layout-truetype to ft-text-vertical-layout-type3
diff --git a/test/Makefile.am b/test/Makefile.am
index e37449a..cfe008f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -96,8 +96,8 @@ endif
if CAIRO_HAS_FT_FONT
TESTS += bitmap-font
TESTS += ft-font-create-for-ft-face
-TESTS += ft-text-vertical-layout-truetype
TESTS += ft-text-vertical-layout-type1
+TESTS += ft-text-vertical-layout-type3
TESTS += ft-text-antialias-none
endif
@@ -213,14 +213,12 @@ fill-rule-ps-argb32-ref.png \
filter-nearest-offset-ref.png \
ft-text-antialias-none-ref.png \
ft-text-antialias-none-ps-argb32-ref.png \
-ft-text-vertical-layout-truetype-ref.png \
-ft-text-vertical-layout-truetype-pdf-argb32-ref.png \
-ft-text-vertical-layout-truetype-ps-argb32-ref.png \
-ft-text-vertical-layout-truetype-svg-ref.png \
ft-text-vertical-layout-type1-ref.png \
ft-text-vertical-layout-type1-pdf-argb32-ref.png \
ft-text-vertical-layout-type1-ps-argb32-ref.png \
ft-text-vertical-layout-type1-svg-ref.png \
+ft-text-vertical-layout-type3-ref.png \
+ft-text-vertical-layout-type3-svg-ref.png \
font-matrix-translation-ref.png \
font-matrix-translation-ps-argb32-ref.png \
font-matrix-translation-svg-ref.png \
diff --git a/test/ft-text-vertical-layout-truetype-ref.png b/test/ft-text-vertical-layout-truetype-ref.png
deleted file mode 100644
index eaee4f0..0000000
Binary files a/test/ft-text-vertical-layout-truetype-ref.png and /dev/null differ
diff --git a/test/ft-text-vertical-layout-truetype-svg-ref.png b/test/ft-text-vertical-layout-truetype-svg-ref.png
deleted file mode 100644
index a01c9d3..0000000
Binary files a/test/ft-text-vertical-layout-truetype-svg-ref.png and /dev/null differ
diff --git a/test/ft-text-vertical-layout-truetype.c b/test/ft-text-vertical-layout-truetype.c
deleted file mode 100644
index 2b2e9cb..0000000
--- a/test/ft-text-vertical-layout-truetype.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright © 2006 Jinghua Luo
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Red Hat, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Red Hat, Inc. makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * JINGHUA LUO DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Jinghua Luo <sunmoon1997 at gmail.com>
- * Derived from:
- * text-antialias-none.c,
- * ft-font-create-for-ft-face.c.
- * Original Author: Carl D. Worth <cworth at cworth.org>
- */
-#include "cairo-test.h"
-#include <cairo-ft.h>
-
-#define WIDTH 80
-#define HEIGHT 200
-#define TEXT_SIZE 30
-
-static cairo_test_draw_function_t draw;
-
-cairo_test_t test = {
- "ft-text-vertical-layout-truetype",
- "Tests text rendering for vertical layout with TrueType fonts",
- WIDTH, HEIGHT,
- draw
-};
-
-static cairo_scaled_font_t *
-create_scaled_font (cairo_t * cr)
-{
- FcPattern *pattern, *resolved;
- FcResult result;
- cairo_font_face_t *font_face;
- cairo_scaled_font_t *scaled_font;
- cairo_font_options_t *font_options;
- cairo_matrix_t font_matrix, ctm;
- double pixel_size;
-
- font_options = cairo_font_options_create ();
-
- cairo_get_font_options (cr, font_options);
-
- pattern = FcPatternCreate ();
-
- FcPatternAddString (pattern, FC_FAMILY, (FcChar8 *)"Bitstream Vera Sans");
- FcPatternAddDouble (pattern, FC_PIXEL_SIZE, TEXT_SIZE);
- FcConfigSubstitute (NULL, pattern, FcMatchPattern);
-
- cairo_ft_font_options_substitute (font_options, pattern);
-
- FcDefaultSubstitute (pattern);
- resolved = FcFontMatch (NULL, pattern, &result);
-
- /* set layout to vertical */
- FcPatternDel (resolved, FC_VERTICAL_LAYOUT);
- FcPatternAddBool (resolved, FC_VERTICAL_LAYOUT, FcTrue);
-
- FcPatternGetDouble (resolved, FC_PIXEL_SIZE, 0, &pixel_size);
-
- font_face = cairo_ft_font_face_create_for_pattern (resolved);
-
- cairo_matrix_init_translate (&font_matrix, 10, 30);
- cairo_matrix_rotate (&font_matrix, M_PI_2/3);
- cairo_matrix_scale (&font_matrix, pixel_size, pixel_size);
-
- cairo_get_matrix (cr, &ctm);
-
- scaled_font = cairo_scaled_font_create (font_face,
- &font_matrix,
- &ctm,
- font_options);
-
- cairo_font_options_destroy (font_options);
- cairo_font_face_destroy (font_face);
- FcPatternDestroy (pattern);
- FcPatternDestroy (resolved);
-
- return scaled_font;
-}
-
-static cairo_test_status_t
-draw (cairo_t *cr, int width, int height)
-{
- cairo_text_extents_t extents;
- cairo_scaled_font_t * scaled_font;
- static char text[] = "i-W";
- double line_width, x, y;
-
- line_width = cairo_get_line_width (cr);
-
- /* We draw in the default black, so paint white first. */
- cairo_save (cr);
- cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
- cairo_paint (cr);
- cairo_restore (cr);
-
- scaled_font = create_scaled_font (cr);
- cairo_set_scaled_font (cr, scaled_font);
-
- cairo_set_line_width (cr, 1.0);
- cairo_set_source_rgb (cr, 0, 0, 0); /* black */
- cairo_text_extents (cr, text, &extents);
- x = width - (extents.width + extents.x_bearing) - 5;
- y = height - (extents.height + extents.y_bearing) - 5;
- cairo_move_to (cr, x, y);
- cairo_show_text (cr, text);
- cairo_rectangle (cr,
- x + extents.x_bearing - line_width / 2,
- y + extents.y_bearing - line_width / 2,
- extents.width + line_width,
- extents.height + line_width);
- cairo_stroke (cr);
-
- cairo_set_source_rgb (cr, 0, 0, 1); /* blue */
- cairo_text_extents (cr, text, &extents);
- x = -extents.x_bearing + 5;
- y = -extents.y_bearing + 5;
- cairo_move_to (cr, x, y);
- cairo_text_path (cr, text);
- cairo_fill (cr);
- cairo_rectangle (cr,
- x + extents.x_bearing - line_width / 2,
- y + extents.y_bearing - line_width / 2,
- extents.width + line_width,
- extents.height + line_width);
- cairo_stroke (cr);
-
- cairo_scaled_font_destroy (scaled_font);
-
- return CAIRO_TEST_SUCCESS;
-}
-
-int
-main (void)
-{
- return cairo_test (&test);
-}
diff --git a/test/ft-text-vertical-layout-type3-ref.png b/test/ft-text-vertical-layout-type3-ref.png
new file mode 100644
index 0000000..eaee4f0
Binary files /dev/null and b/test/ft-text-vertical-layout-type3-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
new file mode 100644
index 0000000..a01c9d3
Binary files /dev/null and b/test/ft-text-vertical-layout-type3-svg-ref.png differ
diff --git a/test/ft-text-vertical-layout-type3.c b/test/ft-text-vertical-layout-type3.c
new file mode 100644
index 0000000..6a12817
--- /dev/null
+++ b/test/ft-text-vertical-layout-type3.c
@@ -0,0 +1,154 @@
+/*
+ * Copyright © 2006 Jinghua Luo
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Red Hat, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Red Hat, Inc. makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * JINGHUA LUO DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Jinghua Luo <sunmoon1997 at gmail.com>
+ * Derived from:
+ * text-antialias-none.c,
+ * ft-font-create-for-ft-face.c.
+ * Original Author: Carl D. Worth <cworth at cworth.org>
+ */
+#include "cairo-test.h"
+#include <cairo-ft.h>
+
+#define WIDTH 80
+#define HEIGHT 200
+#define TEXT_SIZE 30
+
+static cairo_test_draw_function_t draw;
+
+cairo_test_t test = {
+ "ft-text-vertical-layout-type3",
+ "Tests text rendering for vertical layout with TrueType fonts (which will be emitted as type3)",
+ WIDTH, HEIGHT,
+ draw
+};
+
+static cairo_scaled_font_t *
+create_scaled_font (cairo_t * cr)
+{
+ FcPattern *pattern, *resolved;
+ FcResult result;
+ cairo_font_face_t *font_face;
+ cairo_scaled_font_t *scaled_font;
+ cairo_font_options_t *font_options;
+ cairo_matrix_t font_matrix, ctm;
+ double pixel_size;
+
+ font_options = cairo_font_options_create ();
+
+ cairo_get_font_options (cr, font_options);
+
+ pattern = FcPatternCreate ();
+
+ FcPatternAddString (pattern, FC_FAMILY, (FcChar8 *)"Bitstream Vera Sans");
+ FcPatternAddDouble (pattern, FC_PIXEL_SIZE, TEXT_SIZE);
+ FcConfigSubstitute (NULL, pattern, FcMatchPattern);
+
+ cairo_ft_font_options_substitute (font_options, pattern);
+
+ FcDefaultSubstitute (pattern);
+ resolved = FcFontMatch (NULL, pattern, &result);
+
+ /* set layout to vertical */
+ FcPatternDel (resolved, FC_VERTICAL_LAYOUT);
+ FcPatternAddBool (resolved, FC_VERTICAL_LAYOUT, FcTrue);
+
+ FcPatternGetDouble (resolved, FC_PIXEL_SIZE, 0, &pixel_size);
+
+ font_face = cairo_ft_font_face_create_for_pattern (resolved);
+
+ cairo_matrix_init_translate (&font_matrix, 10, 30);
+ cairo_matrix_rotate (&font_matrix, M_PI_2/3);
+ cairo_matrix_scale (&font_matrix, pixel_size, pixel_size);
+
+ cairo_get_matrix (cr, &ctm);
+
+ scaled_font = cairo_scaled_font_create (font_face,
+ &font_matrix,
+ &ctm,
+ font_options);
+
+ cairo_font_options_destroy (font_options);
+ cairo_font_face_destroy (font_face);
+ FcPatternDestroy (pattern);
+ FcPatternDestroy (resolved);
+
+ return scaled_font;
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ cairo_text_extents_t extents;
+ cairo_scaled_font_t * scaled_font;
+ static char text[] = "i-W";
+ double line_width, x, y;
+
+ line_width = cairo_get_line_width (cr);
+
+ /* We draw in the default black, so paint white first. */
+ cairo_save (cr);
+ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
+ cairo_paint (cr);
+ cairo_restore (cr);
+
+ scaled_font = create_scaled_font (cr);
+ cairo_set_scaled_font (cr, scaled_font);
+
+ cairo_set_line_width (cr, 1.0);
+ cairo_set_source_rgb (cr, 0, 0, 0); /* black */
+ cairo_text_extents (cr, text, &extents);
+ x = width - (extents.width + extents.x_bearing) - 5;
+ y = height - (extents.height + extents.y_bearing) - 5;
+ cairo_move_to (cr, x, y);
+ cairo_show_text (cr, text);
+ cairo_rectangle (cr,
+ x + extents.x_bearing - line_width / 2,
+ y + extents.y_bearing - line_width / 2,
+ extents.width + line_width,
+ extents.height + line_width);
+ cairo_stroke (cr);
+
+ cairo_set_source_rgb (cr, 0, 0, 1); /* blue */
+ cairo_text_extents (cr, text, &extents);
+ x = -extents.x_bearing + 5;
+ y = -extents.y_bearing + 5;
+ cairo_move_to (cr, x, y);
+ cairo_text_path (cr, text);
+ cairo_fill (cr);
+ cairo_rectangle (cr,
+ x + extents.x_bearing - line_width / 2,
+ y + extents.y_bearing - line_width / 2,
+ extents.width + line_width,
+ extents.height + line_width);
+ cairo_stroke (cr);
+
+ cairo_scaled_font_destroy (scaled_font);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+ return cairo_test (&test);
+}
More information about the cairo-commit
mailing list