[pango: 6/6] Merge branch 'markup-parse-fixes' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 9be0d6e411c5d4540438fcc8ada287a65b15fb8e
Merge: f9e31856 2ec635ae
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Mar 3 03:46:26 2021 +0000

    Merge branch 'markup-parse-fixes' into 'master'
    
    Markup parse fixes
    
    See merge request GNOME/pango!292

 pango/pango-markup.c            | 50 +++++++++++++++++------------------------
 tests/markup-parse.c            | 17 +++++++++-----
 tests/markups/valid-12.expected |  2 +-
 tests/markups/valid-12.markup   |  2 +-
 tests/markups/valid-13.expected | 21 +++++++++++++++++
 tests/markups/valid-13.markup   |  1 +
 tests/markups/valid-14.expected | 24 ++++++++++++++++++++
 tests/markups/valid-14.markup   |  1 +
 tests/markups/valid-15.expected | 10 +++++++++
 tests/markups/valid-15.markup   |  0
 tests/meson.build               |  3 +++
 11 files changed, 94 insertions(+), 37 deletions(-)
---