[pango: 5/5] Merge branch 'line-breaking-fixes4' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit 55efd092b0319f2a2697c510eafc2b0b23597d26
Merge: a31741fa 0a1218eb
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Nov 23 15:45:58 2021 +0000

    Merge branch 'line-breaking-fixes4' into 'main'
    
    Fix a case of unintended hyphenation
    
    See merge request GNOME/pango!519

 pango/break.c                    |  9 +++++++--
 pango/pango-attributes.h         |  4 ++++
 pango/pango-coverage.h           |  2 ++
 pango/pango-font.h               |  1 +
 pango/pango-layout.c             | 31 +++++++++++++++++++++++++------
 pango/pango-layout.h             |  4 ++++
 pango/pango-tabs.h               |  3 +++
 tests/breaks/eight.expected      |  2 +-
 tests/breaks/eleven.expected     | 14 +++++++-------
 tests/breaks/fifteen.expected    |  4 ++--
 tests/breaks/one.expected        |  4 ++--
 tests/breaks/seventeen.expected  |  2 +-
 tests/breaks/sixteen.expected    |  4 ++--
 tests/breaks/thirteen.expected   |  4 ++--
 tests/breaks/two.break           |  2 +-
 tests/breaks/two.expected        | 14 +++++++-------
 tests/layouts/bratwurst.expected | 32 ++++++++++++++++++++++++++++++++
 tests/layouts/bratwurst.layout   | 21 +++++++++++++++++++++
 18 files changed, 124 insertions(+), 33 deletions(-)
---