[pango: 11/11] Merge branch 'font-variations'

[Behdad Esfahbod <behdad src gnome org>]

commit b97089825723294cb6d4cc75c6e100c195b84369
Merge: 4a90fcc cb84dd0
Author: Behdad Esfahbod <behdad behdad org>
Date:   Wed Jan 3 14:10:44 2018 +0000

    Merge branch 'font-variations'

 docs/pango-sections.txt                |    3 +
 pango-view/test-font-variations.markup |    9 ++
 pango/fonts.c                          |  172 ++++++++++++++++++++++++++++++--
 pango/pango-font.h                     |   13 ++-
 pango/pangocairo-fcfont.c              |    8 ++-
 pango/pangofc-fontmap.c                |   48 ++++++++-
 pango/pangofc-fontmap.h                |   13 +++
 pango/pangofc-shape.c                  |   45 ++++++++
 tests/markup-parse.c                   |   68 ++++++++++++-
 tests/markups/valid-1.expected         |    8 ++
 tests/markups/valid-10.expected        |   24 +++++
 tests/markups/valid-10.markup          |   11 ++
 tests/markups/valid-11.expected        |   50 +++++++++
 tests/markups/valid-11.markup          |   11 ++
 tests/markups/valid-2.expected         |    8 ++
 tests/markups/valid-3.expected         |    6 +
 tests/markups/valid-4.expected         |   18 ++++
 tests/markups/valid-5.expected         |   12 ++
 tests/markups/valid-6.expected         |   12 ++
 tests/markups/valid-7.expected         |    8 ++
 tests/markups/valid-8.expected         |   12 ++
 tests/markups/valid-9.expected         |    6 +
 tests/test-font.c                      |   38 +++++++
 23 files changed, 584 insertions(+), 19 deletions(-)
---