[pango: 8/8] Merge branch 'line-height' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit afd269413f1982565b16645e6d7578d9c5a7fecf
Merge: 05750deb ded87476
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jul 5 21:51:44 2019 +0000

    Merge branch 'line-height' into 'master'
    
    Support line height
    
    See merge request GNOME/pango!64

 docs/layout.png                 | Bin 0 -> 27899 bytes
 docs/layout.svg                 | 497 ++++++++++++++++++++++++++++++++++++++++
 docs/meson.build                |   2 +-
 pango/fonts.c                   |  23 ++
 pango/pango-font-private.h      |   1 +
 pango/pango-font.h              |   2 +
 pango/pango-layout-private.h    |   1 +
 pango/pango-layout.c            | 251 +++++++++++++++-----
 pango/pango-layout.h            |   9 +
 pango/pangocairo-coretextfont.c |   1 +
 pango/pangocairo-font.c         |  38 +--
 pango/pangofc-font.c            |  59 +++--
 pango/pangowin32.c              |   1 +
 utils/viewer-render.c           |   6 +
 14 files changed, 800 insertions(+), 91 deletions(-)
---