[pango: 3/3] Merge branch 'ch/83' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango: 3/3] Merge branch 'ch/83' into 'master'
- Date: Fri, 18 Sep 2020 19:17:33 +0000 (UTC)
commit 3d1240ae397d1637be6887815221bc17112ad4ce
Merge: d3d211a0 e023cf0d
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Sep 18 19:17:32 2020 +0000
Merge branch 'ch/83' into 'master'
Add pango_fc_font_map_set_default_substitute
Closes #83
See merge request GNOME/pango!191
docs/pango-sections.txt | 3 +++
pango/pangocairo-fcfontmap.c | 2 ++
pango/pangofc-fontmap-private.h | 16 +++++++++++---
pango/pangofc-fontmap.c | 25 ++++++++++++++++++++++
pango/pangofc-fontmap.h | 46 +++++++++++++++++++++++++++++++++++++++++
pango/pangoft2-fontmap.c | 39 ++++++++++------------------------
pango/pangoft2.h | 6 +++---
pango/pangoxft-fontmap.c | 39 ++++++++++------------------------
pango/pangoxft.h | 6 ++++--
9 files changed, 118 insertions(+), 64 deletions(-)
---
diff --cc pango/pangocairo-fcfontmap.c
index 015b8170,5fe61f54..dec59c8b
--- a/pango/pangocairo-fcfontmap.c
+++ b/pango/pangocairo-fcfontmap.c
@@@ -103,8 -103,10 +103,10 @@@ pango_cairo_fc_font_map_fontset_key_sub
PangoFcFontsetKey *fontkey,
FcPattern *pattern)
{
- FcConfigSubstitute (NULL, pattern, FcMatchPattern);
+ FcConfigSubstitute (pango_fc_font_map_get_config (fcfontmap), pattern, FcMatchPattern);
+ if (fcfontmap->substitute_func)
+ fcfontmap->substitute_func (pattern, fcfontmap->substitute_data);
if (fontkey)
cairo_ft_font_options_substitute (pango_fc_fontset_key_get_context_key (fontkey),
pattern);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]