Convert to the pango2 prefix

This makes pango 2 not just parallel-installable
with pango 1.x, but parallel-usable in the same
process.

1 files changed, 74 insertions, 74 deletions

diff --git a/tests/testmatrix.c b/tests/testmatrix.c
index aa309193..0549764c 100644
--- a/tests/testmatrix.c
+++ b/tests/testmatrix.c
@@ -1,5 +1,5 @@
-/* Pango
- * testmatrix.c: Test program for PangoMatrix
+/* Pango2
+ * testmatrix.c: Test program for Pango2Matrix
  *
  * Copyright (C) 2021 Matthias Clasen
  *
@@ -34,11 +34,11 @@
 static void
 test_matrix_translate (void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
-  PangoMatrix m2 = PANGO_MATRIX_INIT;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
+  Pango2Matrix m2 = PANGO2_MATRIX_INIT;
 
-  pango_matrix_translate (&m, 10, 10);
-  pango_matrix_translate (&m, -10, -10);
+  pango2_matrix_translate (&m, 10, 10);
+  pango2_matrix_translate (&m, -10, -10);
 
   g_assert_true (matrix_equal (&m, &m2));
 }
@@ -46,13 +46,13 @@ test_matrix_translate (void)
 static void
 test_matrix_rotate (void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
-  PangoMatrix m2 = PANGO_MATRIX_INIT;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
+  Pango2Matrix m2 = PANGO2_MATRIX_INIT;
 
-  pango_matrix_rotate (&m, 90);
-  pango_matrix_rotate (&m, 90);
-  pango_matrix_rotate (&m, 90);
-  pango_matrix_rotate (&m, 90);
+  pango2_matrix_rotate (&m, 90);
+  pango2_matrix_rotate (&m, 90);
+  pango2_matrix_rotate (&m, 90);
+  pango2_matrix_rotate (&m, 90);
 
   g_assert_true (matrix_equal (&m, &m2));
 }
@@ -60,10 +60,10 @@ test_matrix_rotate (void)
 static void
 test_matrix_scale(void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
-  PangoMatrix m2 = PANGO_MATRIX_INIT;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
+  Pango2Matrix m2 = PANGO2_MATRIX_INIT;
 
-  pango_matrix_scale (&m, 4, 5);
+  pango2_matrix_scale (&m, 4, 5);
   m2.xx = 4;
   m2.yy = 5;
 
@@ -73,35 +73,35 @@ test_matrix_scale(void)
 static void
 test_matrix_concat (void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
-  PangoMatrix id = PANGO_MATRIX_INIT;
-  PangoMatrix *m2;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
+  Pango2Matrix id = PANGO2_MATRIX_INIT;
+  Pango2Matrix *m2;
 
-  pango_matrix_rotate (&m, 120);
-  m2 = pango_matrix_copy (&m);
-  pango_matrix_concat (m2, &m);
-  pango_matrix_concat (m2, &m);
+  pango2_matrix_rotate (&m, 120);
+  m2 = pango2_matrix_copy (&m);
+  pango2_matrix_concat (m2, &m);
+  pango2_matrix_concat (m2, &m);
 
   g_assert_true (matrix_equal (&id, m2));
 
-  pango_matrix_free (m2);
+  pango2_matrix_free (m2);
 }
 
 static void
 test_matrix_font_scale (void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
   double x, y;
 
-  pango_matrix_scale (&m, 2, 3);
+  pango2_matrix_scale (&m, 2, 3);
 
-  pango_matrix_get_font_scale_factors (&m, &x, &y);
+  pango2_matrix_get_font_scale_factors (&m, &x, &y);
   g_assert_cmpfloat (x, ==, 2);
   g_assert_cmpfloat (y, ==, 3);
-  g_assert_cmpfloat (pango_matrix_get_font_scale_factor (&m), ==, 3);
+  g_assert_cmpfloat (pango2_matrix_get_font_scale_factor (&m), ==, 3);
 
-  pango_matrix_rotate (&m, 90);
-  pango_matrix_get_font_scale_factors (&m, &x, &y);
+  pango2_matrix_rotate (&m, 90);
+  pango2_matrix_get_font_scale_factors (&m, &x, &y);
   g_assert_cmpfloat (x, ==, 3);
   g_assert_cmpfloat (y, ==, 2);
 }
@@ -109,17 +109,17 @@ test_matrix_font_scale (void)
 static void
 test_matrix_transform_point (void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
   double x, y;
 
-  pango_matrix_translate (&m, 1, 1);
-  pango_matrix_scale (&m, 2, 4);
-  pango_matrix_rotate (&m, -90);
+  pango2_matrix_translate (&m, 1, 1);
+  pango2_matrix_scale (&m, 2, 4);
+  pango2_matrix_rotate (&m, -90);
 
   x = 1;
   y = 0;
 
-  pango_matrix_transform_point (&m, &x, &y);
+  pango2_matrix_transform_point (&m, &x, &y);
 
   g_assert_cmpfloat_with_epsilon (x, 1, 0.001);
   g_assert_cmpfloat_with_epsilon (y, 5, 0.001);
@@ -128,17 +128,17 @@ test_matrix_transform_point (void)
 static void
 test_matrix_transform_distance (void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
   double x, y;
 
-  pango_matrix_translate (&m, 1, 1);
-  pango_matrix_scale (&m, 2, 4);
-  pango_matrix_rotate (&m, -90);
+  pango2_matrix_translate (&m, 1, 1);
+  pango2_matrix_scale (&m, 2, 4);
+  pango2_matrix_rotate (&m, -90);
 
   x = 1;
   y = 0;
 
-  pango_matrix_transform_distance (&m, &x, &y);
+  pango2_matrix_transform_distance (&m, &x, &y);
 
   g_assert_cmpfloat_with_epsilon (x, 0, 0.001);
   g_assert_cmpfloat_with_epsilon (y, 4, 0.001);
@@ -147,38 +147,38 @@ test_matrix_transform_distance (void)
 static void
 test_matrix_transform_rect (void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
-  PangoRectangle rect;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
+  Pango2Rectangle rect;
 
-  pango_matrix_rotate (&m, 45);
+  pango2_matrix_rotate (&m, 45);
 
   rect.x = 0;
   rect.y = 0;
-  rect.width = 1 * PANGO_SCALE;
-  rect.height = 1 * PANGO_SCALE;
+  rect.width = 1 * PANGO2_SCALE;
+  rect.height = 1 * PANGO2_SCALE;
 
-  pango_matrix_transform_rectangle (&m, &rect);
+  pango2_matrix_transform_rectangle (&m, &rect);
 
   g_assert_cmpfloat_with_epsilon (rect.x, 0, 0.5);
-  g_assert_cmpfloat_with_epsilon (rect.y, - G_SQRT2  / 2 * PANGO_SCALE, 0.5);
-  g_assert_cmpfloat_with_epsilon (rect.width, G_SQRT2 * PANGO_SCALE, 0.5);
-  g_assert_cmpfloat_with_epsilon (rect.height, G_SQRT2 * PANGO_SCALE, 0.5);
+  g_assert_cmpfloat_with_epsilon (rect.y, - G_SQRT2  / 2 * PANGO2_SCALE, 0.5);
+  g_assert_cmpfloat_with_epsilon (rect.width, G_SQRT2 * PANGO2_SCALE, 0.5);
+  g_assert_cmpfloat_with_epsilon (rect.height, G_SQRT2 * PANGO2_SCALE, 0.5);
 }
 
 static void
 test_matrix_transform_pixel_rect (void)
 {
-  PangoMatrix m = PANGO_MATRIX_INIT;
-  PangoRectangle rect;
+  Pango2Matrix m = PANGO2_MATRIX_INIT;
+  Pango2Rectangle rect;
 
-  pango_matrix_rotate (&m, 45);
+  pango2_matrix_rotate (&m, 45);
 
   rect.x = 0;
   rect.y = 0;
   rect.width = 1;
   rect.height = 1;
 
-  pango_matrix_transform_pixel_rectangle (&m, &rect);
+  pango2_matrix_transform_pixel_rectangle (&m, &rect);
 
   g_assert_cmpfloat_with_epsilon (rect.x, 0, 0.1);
   g_assert_cmpfloat_with_epsilon (rect.y, -1, 0.1);
@@ -187,68 +187,68 @@ test_matrix_transform_pixel_rect (void)
 }
 
 static void
-pango_matrix_postrotate (PangoMatrix *m,
+pango2_matrix_postrotate (Pango2Matrix *m,
                          double       angle)
 {
-  PangoMatrix rot = (PangoMatrix) PANGO_MATRIX_INIT;
+  Pango2Matrix rot = (Pango2Matrix) PANGO2_MATRIX_INIT;
 
-  pango_matrix_rotate (&rot, angle);
-  pango_matrix_concat (&rot, m);
+  pango2_matrix_rotate (&rot, angle);
+  pango2_matrix_concat (&rot, m);
   *m = rot;
 }
 
 static void
 test_matrix_slant_ratio (void)
 {
-  PangoMatrix m = (PangoMatrix) { 1, 0.2, 0, 1, 0, 0 };
-  PangoMatrix m2 = (PangoMatrix) { 1, 0.4, 0, 1, 0, 0 };
-  PangoMatrix m3 = (PangoMatrix) { 1, 0.3, 0, 2, 0, 0 };
+  Pango2Matrix m = (Pango2Matrix) { 1, 0.2, 0, 1, 0, 0 };
+  Pango2Matrix m2 = (Pango2Matrix) { 1, 0.4, 0, 1, 0, 0 };
+  Pango2Matrix m3 = (Pango2Matrix) { 1, 0.3, 0, 2, 0, 0 };
   double a;
   double sx, sy;
   double r;
 
-  a = pango_matrix_get_rotation (&m);
+  a = pango2_matrix_get_rotation (&m);
   g_assert_cmpfloat_with_epsilon (a, 0, 0.001);
 
-  pango_matrix_get_font_scale_factors (&m, &sx, &sy);
+  pango2_matrix_get_font_scale_factors (&m, &sx, &sy);
   g_assert_cmpfloat_with_epsilon (sx, 1, 0.001);
   g_assert_cmpfloat_with_epsilon (sy, 1, 0.001);
 
-  r = pango_matrix_get_slant_ratio (&m);
+  r = pango2_matrix_get_slant_ratio (&m);
   g_assert_cmpfloat_with_epsilon (r, 0.2, 0.001);
 
-  pango_matrix_postrotate (&m, 45);
+  pango2_matrix_postrotate (&m, 45);
 
-  a = pango_matrix_get_rotation (&m);
+  a = pango2_matrix_get_rotation (&m);
   g_assert_cmpfloat_with_epsilon (a, 45, 0.001);
 
-  pango_matrix_postrotate (&m, -a);
+  pango2_matrix_postrotate (&m, -a);
 
-  pango_matrix_get_font_scale_factors (&m, &sx, &sy);
+  pango2_matrix_get_font_scale_factors (&m, &sx, &sy);
   g_assert_cmpfloat_with_epsilon (sx, 1, 0.001);
   g_assert_cmpfloat_with_epsilon (sy, 1, 0.001);
 
-  r = pango_matrix_get_slant_ratio (&m);
+  r = pango2_matrix_get_slant_ratio (&m);
   g_assert_cmpfloat_with_epsilon (r, 0.2, 0.001);
 
-  pango_matrix_scale (&m, 2, 3);
+  pango2_matrix_scale (&m, 2, 3);
 
-  a = pango_matrix_get_rotation (&m);
+  a = pango2_matrix_get_rotation (&m);
   g_assert_cmpfloat_with_epsilon (a, 0, 0.001);
 
-  pango_matrix_get_font_scale_factors (&m, &sx, &sy);
+  pango2_matrix_get_font_scale_factors (&m, &sx, &sy);
   g_assert_cmpfloat_with_epsilon (sx, 2, 0.001);
   g_assert_cmpfloat_with_epsilon (sy, 3, 0.001);
 
-  pango_matrix_scale (&m, 1/sx, 1/sy);
+  pango2_matrix_scale (&m, 1/sx, 1/sy);
 
-  r = pango_matrix_get_slant_ratio (&m);
+  r = pango2_matrix_get_slant_ratio (&m);
   g_assert_cmpfloat_with_epsilon (r, 0.2, 0.001);
 
-  r = pango_matrix_get_slant_ratio (&m2);
+  r = pango2_matrix_get_slant_ratio (&m2);
   g_assert_cmpfloat_with_epsilon (r, 0.4, 0.001);
 
-  r = pango_matrix_get_slant_ratio (&m3);
+  r = pango2_matrix_get_slant_ratio (&m3);
 
   g_assert_cmpfloat_with_epsilon (r, 0.15, 0.001);
 }