diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-18 16:58:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-18 16:58:15 +0000 |
| commit | f05be99189d928c3ebfeb8c6b6fded34cdca6671 (patch) | |
| tree | 11758909471043d56032d63ee95e248ac719f883 /pango/pangofc-fontmap.c | |
| parent | bff2adace6949e598e085eb23497e7d2629d06d5 (diff) | |
| parent | 3396cc209b1b9a68d8b05d2bb9658c44c9df83b9 (diff) | |
| download | pango-f05be99189d928c3ebfeb8c6b6fded34cdca6671.tar.gz | |
Merge branch 'vertical-upright-glyphs' into 'master'
Fix placement of marks in upright vertical text for fonts without vertical metrics.
Closes #454
See merge request GNOME/pango!297
Diffstat (limited to 'pango/pangofc-fontmap.c')
| -rw-r--r-- | pango/pangofc-fontmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 358b33fb..5d5dfe55 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1837,7 +1837,6 @@ pango_fc_make_pattern (const PangoFontDescription *description, int slant; double weight; PangoGravity gravity; - FcBool vertical; char **families; int i; int width; @@ -1848,7 +1847,6 @@ pango_fc_make_pattern (const PangoFontDescription *description, width = pango_fc_convert_width_to_fc (pango_font_description_get_stretch (description)); gravity = pango_font_description_get_gravity (description); - vertical = PANGO_GRAVITY_IS_VERTICAL (gravity) ? FcTrue : FcFalse; /* The reason for passing in FC_SIZE as well as FC_PIXEL_SIZE is * to work around a bug in libgnomeprint where it doesn't look @@ -1857,13 +1855,14 @@ pango_fc_make_pattern (const PangoFontDescription *description, * Putting FC_SIZE in here slightly reduces the efficiency * of caching of patterns and fonts when working with multiple different * dpi values. + * + * Do not pass FC_VERTICAL_LAYOUT true as HarfBuzz shaping assumes false. */ pattern = FcPatternBuild (NULL, PANGO_FC_VERSION, FcTypeInteger, pango_version(), FC_WEIGHT, FcTypeDouble, weight, FC_SLANT, FcTypeInteger, slant, FC_WIDTH, FcTypeInteger, width, - FC_VERTICAL_LAYOUT, FcTypeBool, vertical, #ifdef FC_VARIABLE FC_VARIABLE, FcTypeBool, FcDontCare, #endif |