[pango: 6/6] Merge branch 'serializer2' into 'main'




commit f82c7d11f098d3e4d26c24bc7decf475aed2109d
Merge: 97300279 43f78996
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Nov 18 19:31:16 2021 +0000

    Merge branch 'serializer2' into 'main'
    
    Add layout serialization api
    
    See merge request GNOME/pango!513

 .gitlab-ci.yml                  |   2 +-
 .gitlab-ci/fedora.Dockerfile    |   1 +
 meson.build                     |   5 +
 pango.supp                      |  15 +
 pango/meson.build               |   1 +
 pango/pango-attributes.c        |   5 +-
 pango/pango-layout.h            |  25 ++
 pango/serializer.c              | 935 ++++++++++++++++++++++++++++++++++++++++
 subprojects/json-glib.wrap      |   5 +
 tests/layouts/valid-1.layout    |  20 +
 tests/layouts/valid-1.markup    |   2 -
 tests/layouts/valid-10.layout   |   8 +
 tests/layouts/valid-10.markup   |   2 -
 tests/layouts/valid-11.layout   |  42 ++
 tests/layouts/valid-11.markup   |   2 -
 tests/layouts/valid-12.layout   |  15 +
 tests/layouts/valid-12.markup   |   2 -
 tests/layouts/valid-13.layout   |  16 +
 tests/layouts/valid-13.markup   |   2 -
 tests/layouts/valid-14.layout   |   8 +
 tests/layouts/valid-14.markup   |   2 -
 tests/layouts/valid-15.layout   |   8 +
 tests/layouts/valid-15.markup   |   2 -
 tests/layouts/valid-16.layout   |   9 +
 tests/layouts/valid-16.markup   |   2 -
 tests/layouts/valid-17.layout   |   7 +
 tests/layouts/valid-17.markup   |   2 -
 tests/layouts/valid-18.layout   |  11 +
 tests/layouts/valid-18.markup   |   2 -
 tests/layouts/valid-19.layout   |   5 +
 tests/layouts/valid-19.markup   |   2 -
 tests/layouts/valid-2.layout    |  18 +
 tests/layouts/valid-2.markup    |   2 -
 tests/layouts/valid-20.layout   |  22 +
 tests/layouts/valid-20.markup   |   2 -
 tests/layouts/valid-21.expected |  36 --
 tests/layouts/valid-21.markup   |   2 -
 tests/layouts/valid-22.layout   |  84 ++++
 tests/layouts/valid-22.markup   |   2 -
 tests/layouts/valid-3.layout    |   5 +
 tests/layouts/valid-3.markup    |   2 -
 tests/layouts/valid-4.layout    |   6 +
 tests/layouts/valid-4.markup    |   2 -
 tests/layouts/valid-5.layout    |  13 +
 tests/layouts/valid-5.markup    |   3 -
 tests/layouts/valid-6.layout    |   5 +
 tests/layouts/valid-6.markup    |   2 -
 tests/layouts/valid-7.layout    |  21 +
 tests/layouts/valid-7.markup    |   2 -
 tests/layouts/valid-8.layout    |   8 +
 tests/layouts/valid-8.markup    |   2 -
 tests/layouts/valid-9.layout    |  12 +
 tests/layouts/valid-9.markup    |   2 -
 tests/test-layout.c             | 277 +-----------
 tests/testserialize.c           | 189 ++++++++
 55 files changed, 1540 insertions(+), 344 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]