[pango: 2/2] Merge branch 'ellipsize-height' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 3bca86ac35fb300e2ec5bd24b411f70733952fea
Merge: 0e126143 550aafc6
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Aug 7 05:05:04 2019 +0000

    Merge branch 'ellipsize-height' into 'master'
    
    Pass the right attributes when shaping ellipses
    
    Closes #397
    
    See merge request GNOME/pango!127

 pango/pango-layout.c           |  2 +-
 tests/layouts/valid-1.expected |  2 +-
 tests/meson.build              |  1 +
 tests/test-ellipsize.c         | 73 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)
---