summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
Diffstat (limited to 'pango')
-rw-r--r--pango/pango-matrix.c34
-rw-r--r--pango/pango-matrix.h2
-rw-r--r--pango/pangofc-font.c12
3 files changed, 46 insertions, 2 deletions
diff --git a/pango/pango-matrix.c b/pango/pango-matrix.c
index a066eb57..3bc0ff16 100644
--- a/pango/pango-matrix.c
+++ b/pango/pango-matrix.c
@@ -263,6 +263,40 @@ pango_matrix_get_font_scale_factors (const PangoMatrix *matrix,
}
/**
+ * pango_matrix_get_slant_ratio:
+ * @matrix: a `PangoMatrix`
+ *
+ * Gets the slant ratio of a matrix.
+ *
+ * For a simple shear matrix in the form:
+ *
+ * 1 λ
+ * 0 1
+ *
+ * this is simply λ.
+ *
+ * Returns: the slant ratio of @matrix
+ *
+ * Since: 1.50
+ */
+double
+pango_matrix_get_slant_ratio (const PangoMatrix *matrix)
+{
+ double x0, y0;
+ double x1, y1;
+
+ x0 = 0;
+ y0 = 1;
+ pango_matrix_transform_distance (matrix, &x0, &y0);
+
+ x1 = 1;
+ y1 = 0;
+ pango_matrix_transform_distance (matrix, &x1, &y1);
+
+ return (x0 * x1 + y0 * y1) / (x0 * x0 + y0 * y0);
+}
+
+/**
* pango_matrix_transform_distance:
* @matrix: (nullable): a `PangoMatrix`
* @dx: (inout): in/out X component of a distance vector
diff --git a/pango/pango-matrix.h b/pango/pango-matrix.h
index d4277401..cb53a422 100644
--- a/pango/pango-matrix.h
+++ b/pango/pango-matrix.h
@@ -121,6 +121,8 @@ double pango_matrix_get_font_scale_factor (const PangoMatrix *matrix) G_GNUC_PUR
PANGO_AVAILABLE_IN_1_38
void pango_matrix_get_font_scale_factors (const PangoMatrix *matrix,
double *xscale, double *yscale);
+PANGO_AVAILABLE_IN_1_50
+double pango_matrix_get_slant_ratio (const PangoMatrix *matrix) G_GNUC_PURE;
G_END_DECLS
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 03f15efa..9d555a37 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -964,10 +964,12 @@ pango_fc_font_create_hb_font (PangoFont *font)
double x_scale, y_scale;
double pixel_size;
double point_size;
+ double slant G_GNUC_UNUSED;
x_scale_inv = y_scale_inv = 1.0;
pixel_size = 1.0;
point_size = 1.0;
+ slant = 0.0;
key = _pango_fc_font_get_font_key (fc_font);
if (key)
@@ -988,11 +990,12 @@ pango_fc_font_create_hb_font (PangoFont *font)
FcMatrixMultiply (&fc_matrix, &fc_matrix, fc_matrix_val);
font_matrix.xx = fc_matrix.xx;
- font_matrix.yx = fc_matrix.yx;
+ font_matrix.yx = - fc_matrix.yx;
font_matrix.xy = fc_matrix.xy;
- font_matrix.yy = fc_matrix.yy;
+ font_matrix.yy = - fc_matrix.yy;
pango_matrix_get_font_scale_factors (&font_matrix, &x, &y);
+ slant = pango_matrix_get_slant_ratio (&font_matrix);
x_scale_inv /= x;
y_scale_inv /= y;
@@ -1003,6 +1006,7 @@ pango_fc_font_create_hb_font (PangoFont *font)
x_scale_inv = -x_scale_inv;
y_scale_inv = -y_scale_inv;
}
+
get_font_size (key, &pixel_size, &point_size);
}
@@ -1017,6 +1021,10 @@ pango_fc_font_create_hb_font (PangoFont *font)
pixel_size * PANGO_SCALE * y_scale);
hb_font_set_ptem (hb_font, point_size);
+#if HB_VERSION_ATLEAST (3, 3, 0)
+ hb_font_set_synthetic_slant (hb_font, slant);
+#endif
+
if (key)
{
const FcPattern *pattern = pango_fc_font_key_get_pattern (key);