[gtk: 11/11] Merge branch 'css-line-height2' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 383ea0d86a3b1a88e5719ab431e9cb2b781d35d3
Merge: df8f75bb8f 6c19a8352f
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 22 19:47:10 2021 +0000

    Merge branch 'css-line-height2' into 'master'
    
    Implement CSS line-height
    
    See merge request GNOME/gtk!3833

 demos/gtk-demo/fontify.c                          |   3 +
 demos/gtk-demo/markup.c                           |   2 +-
 demos/gtk-demo/markup.txt                         |   5 +-
 docs/reference/gtk/css-properties.md              |   1 +
 gtk/gtkcssanimatedstyle.c                         |   4 +
 gtk/gtkcsslineheightvalue.c                       | 184 ++++++++++++++++++++++
 gtk/gtkcsslineheightvalueprivate.h                |  37 +++++
 gtk/gtkcssstaticstyle.c                           |   6 +-
 gtk/gtkcssstyle.c                                 |  17 ++
 gtk/gtkcssstyle.h                                 |   0
 gtk/gtkcssstyleprivate.h                          |   1 +
 gtk/gtkcssstylepropertyimpl.c                     |  14 ++
 gtk/gtkcsstypesprivate.h                          |   1 +
 gtk/gtktextattributes.c                           |   4 +
 gtk/gtktextattributes.h                           |   3 +
 gtk/gtktextbuffer.c                               |   3 +
 gtk/gtktextlayout.c                               |  17 +-
 gtk/gtktexttag.c                                  |  36 +++++
 gtk/gtktexttagprivate.h                           |   1 +
 gtk/gtktextview.c                                 |  13 ++
 gtk/meson.build                                   |   1 +
 testsuite/css/parser/line-height-invalid1.css     |   3 +
 testsuite/css/parser/line-height-invalid1.errors  |   1 +
 testsuite/css/parser/line-height-invalid1.ref.css |   0
 testsuite/css/parser/line-height-invalid2.css     |   3 +
 testsuite/css/parser/line-height-invalid2.errors  |   1 +
 testsuite/css/parser/line-height-invalid2.ref.css |   0
 testsuite/css/parser/line-height-invalid3.css     |   3 +
 testsuite/css/parser/line-height-invalid3.errors  |   1 +
 testsuite/css/parser/line-height-invalid3.ref.css |   0
 testsuite/css/parser/line-height.css              |  27 ++++
 testsuite/css/parser/line-height.ref.css          |  27 ++++
 testsuite/css/parser/meson.build                  |  11 ++
 33 files changed, 425 insertions(+), 5 deletions(-)
---