[pango/pango-1-46: 9/9] Merge branch 'pango-1-46' into 'pango-1-46'

[Matthias Clasen <matthiasc src gnome org>]

commit 7570667d08c7bb968316a8a40c6e65cee9c4b35b
Merge: 99f4661a 00e222ab
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun May 9 01:32:53 2021 +0000

    Merge branch 'pango-1-46' into 'pango-1-46'
    
    [1.46] Cherry pick various upstream fixes
    
    See merge request GNOME/pango!322

 pango/pango-context.c    |  2 +-
 pango/pango-glyph-item.c | 11 +++++++-
 pango/pango-markup.c     | 50 ++++++++++++++--------------------
 pango/pangofc-fontmap.c  | 24 +++++++++++++---
 pango/pangofc-shape.c    |  4 +--
 tests/meson.build        |  2 ++
 tests/test-font.c        | 71 +++++++++++++++++++++++++++++++++++++++++++++++-
 tests/test-shape.c       |  4 +--
 tests/testmisc.c         | 14 ++++++++++
 9 files changed, 141 insertions(+), 41 deletions(-)
---