[pango: 4/4] Merge branch 'markup-sizes' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit 4d4d9e02892f6ed8496af5e2c6067d650eff3fd5
Merge: 1f262e41 59d38cde
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 8 14:44:57 2021 +0000

    Merge branch 'markup-sizes' into 'main'
    
    markup: Allow specifying size in pt or px
    
    Closes #67 and #23
    
    See merge request GNOME/pango!391

 docs/pango_markup.md            | 19 +++++---
 pango/pango-markup.c            | 96 +++++++++++++++++++++++++++++++----------
 tests/markups/fail-11.expected  |  2 +-
 tests/markups/fail-19.expected  |  1 -
 tests/markups/fail-19.markup    |  1 -
 tests/markups/valid-20.expected | 14 ++++++
 tests/markups/valid-20.markup   |  1 +
 tests/markups/valid-21.expected | 14 ++++++
 tests/markups/valid-21.markup   |  1 +
 tests/markups/valid-22.expected | 14 ++++++
 tests/markups/valid-22.markup   |  1 +
 tests/markups/valid-23.expected | 18 ++++++++
 tests/markups/valid-23.markup   |  1 +
 13 files changed, 150 insertions(+), 33 deletions(-)
---