[pango: 5/5] Merge branch 'fontset-cosmetics' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit 07c91f9b2f9f3979939d6d7adcd22968b9b5b33e
Merge: 7d3bd86d ebf371b6
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Dec 25 04:31:16 2021 +0000

    Merge branch 'fontset-cosmetics' into 'main'
    
    Split off PangoFontsetSimple
    
    See merge request GNOME/pango!564

 pango/itemize.c                                    |   2 +-
 pango/meson.build                                  |   1 +
 pango/pango-context.c                              |   2 +-
 pango/pango-fontmap.c                              |   2 +-
 ...et-private.h => pango-fontset-simple-private.h} |  29 ++-
 pango/pango-fontset-simple.c                       | 185 ++++++++++++++
 pango/pango-fontset-simple.h                       |  64 +++++
 pango/pango-fontset.c                              | 284 +++------------------
 pango/pango-fontset.h                              |  61 ++---
 pango/pango.h                                      |   1 +
 pango/pangocoretext-fontmap.c                      |   1 +
 pango/pangocoretext-private.h                      |   1 -
 pango/pangofc-fontmap-private.h                    |   4 +-
 pango/pangowin32-private.h                         |   2 +-
 14 files changed, 330 insertions(+), 309 deletions(-)
---