[pango] (25 commits) Non-fast-forward update to branch redo-attrs

[Matthias Clasen <matthiasc src gnome org>]

The branch 'redo-attrs' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  0f2ccba... Add a userfont example
  b2d8a6c... cairoshape: fixup
  d58342a... Share more code between hbface and userface
  f4c319b... Drop pango_hb_font_get_size
  2f1c1f0... Fix up non-user font shaping
  b16425a... testhbfont: update for generic families
  db51846... pango/pango-version-macros.h: Mention correct version check
  1d8eb69... Drop shape attributes
  bac4915... Redo attributes
  aac720f... Split pango-attributes.[hc]
  e2aa411... Add PangoAttrAffects
  516a9c2... Add PangoAttrMerge flags
  3abdcfd... Rename pango_attribute_get_custom
  64cf661... Tweaks
  3a9feec... Change color attr api
  9ee34c5... Drop some underline variants
  ae40e5e... Split off and underline position attribute
  f28a98e... Rename PangoUnderline to PangoLineStyle
  ea3f33a... Make strikethrough styled
  e337ef1... More work on line styles
  7ef497a... Add a line api to PangoRenderer
  7c6442e... Cosmetics
  350e2d5... Cosmetics
  f3b5755... Cosmetics
  ca4db0b... Add alpha to PangoColor

Commits added to the branch:

  0b285d9... Add a userfont example (*)
  4846842... cairoshape: fixup (*)
  8ba64fd... Share more code between hbface and userface (*)
  465d134... Drop pango_hb_font_get_size (*)
  e05c0ed... Fix up non-user font shaping (*)
  e7dba0e... testhbfont: update for generic families (*)
  8f2d4aa... pango/pango-version-macros.h: Mention correct version check
  f9568e7... Drop shape attributes
  04aae5f... Redo attributes
  03d2aff... Split pango-attributes.[hc]
  ee0197d... Add PangoAttrAffects
  363fc46... Add PangoAttrMerge flags
  0d0dee9... Rename pango_attribute_get_custom
  ef993ae... Tweaks
  007ef39... Change color attr api
  7d656b0... Drop some underline variants
  16b209a... Split off and underline position attribute
  3f20d1b... Rename PangoUnderline to PangoLineStyle
  3bd0121... Make strikethrough styled
  0865866... More work on line styles
  2864eb5... Add a line api to PangoRenderer
  d6ddea8... Cosmetics
  33edaac... Cosmetics
  47d07d4... Cosmetics
  5b4d403... Add alpha to PangoColor

(*) This commit already existed in another branch; no separate mail sent