@@ -5,12 +5,12 @@
 import matplotlib
 import matplotlib.pyplot
 import matplotlib._cntr
+import matplotlib._ft2
 import matplotlib._image
 import matplotlib._path
 import matplotlib._png
 import matplotlib._tri
 import matplotlib.backends._backend_agg
-import matplotlib.ft2font
 import matplotlib.ttconv
 if platform.system() not in ['Windows']:
     import matplotlib.backends._tkagg
 
@@ -9,13 +9,12 @@
 """
 from __future__ import print_function
 import matplotlib
-from matplotlib.ft2font import FT2Font, KERNING_DEFAULT, KERNING_UNFITTED, KERNING_UNSCALED
+from matplotlib import _ft2
 
 
-#fname = '/usr/share/fonts/sfd/FreeSans.ttf'
 fname = matplotlib.get_data_path() + '/fonts/ttf/DejaVuSans.ttf'
-font = FT2Font(fname)
-font.set_charmap(0)
+font = _ft2.Face(fname)
+font.set_charmap(0)  # FIXME
 
 codes = font.get_charmap().items()
 #dsu = [(ccode, glyphind) for ccode, glyphind in codes]
@@ -34,11 +33,8 @@
     coded[name] = ccode
     glyphd[name] = glyphind
 
-code = coded['A']
-glyph = font.load_char(code)
-#print(glyph.bbox)
 print(glyphd['A'], glyphd['V'], coded['A'], coded['V'])
-print('AV', font.get_kerning(glyphd['A'], glyphd['V'], KERNING_DEFAULT))
-print('AV', font.get_kerning(glyphd['A'], glyphd['V'], KERNING_UNFITTED))
-print('AV', font.get_kerning(glyphd['A'], glyphd['V'], KERNING_UNSCALED))
-print('AV', font.get_kerning(glyphd['A'], glyphd['T'], KERNING_UNSCALED))
+print('AV', font.get_kerning(glyphd['A'], glyphd['V'], _ft2.Kerning.DEFAULT))
+print('AV', font.get_kerning(glyphd['A'], glyphd['V'], _ft2.Kerning.UNFITTED))
+print('AV', font.get_kerning(glyphd['A'], glyphd['V'], _ft2.Kerning.UNSCALED))
+print('AV', font.get_kerning(glyphd['A'], glyphd['T'], _ft2.Kerning.UNSCALED))
@@ -1,68 +1,54 @@
 """
-============
-Ftface Props
-============
-
-This is a demo script to show you how to use all the properties of an
-FT2Font object.  These describe global font properties.  For
-individual character metrics, use the Glyph object, as returned by
-load_char
+===============
+Face properties
+===============
+
+This is a demo script to show you how to use all the properties of a Face
+object.  These describe global font properties.  For individual character
+metrics, use the Glyph object, as loaded from the glyph attribute after calling
+load_char.
 """
 from __future__ import print_function
 import matplotlib
-import matplotlib.ft2font as ft
-
-
-#fname = '/usr/local/share/matplotlib/VeraIt.ttf'
-fname = matplotlib.get_data_path() + '/fonts/ttf/DejaVuSans-Oblique.ttf'
-#fname = '/usr/local/share/matplotlib/cmr10.ttf'
-
-font = ft.FT2Font(fname)
-
-print('Num faces   :', font.num_faces)        # number of faces in file
-print('Num glyphs  :', font.num_glyphs)       # number of glyphs in the face
-print('Family name :', font.family_name)      # face family name
-print('Style name  :', font.style_name)       # face style name
-print('PS name     :', font.postscript_name)  # the postscript name
-print('Num fixed   :', font.num_fixed_sizes)  # number of embedded bitmap in face
-
-# the following are only available if face.scalable
-if font.scalable:
-    # the face global bounding box (xmin, ymin, xmax, ymax)
-    print('Bbox                :', font.bbox)
-    # number of font units covered by the EM
-    print('EM                  :', font.units_per_EM)
-    # the ascender in 26.6 units
-    print('Ascender            :', font.ascender)
-    # the descender in 26.6 units
-    print('Descender           :', font.descender)
-    # the height in 26.6 units
-    print('Height              :', font.height)
-    # maximum horizontal cursor advance
-    print('Max adv width       :', font.max_advance_width)
-    # same for vertical layout
-    print('Max adv height      :', font.max_advance_height)
-    # vertical position of the underline bar
-    print('Underline pos       :', font.underline_position)
-    # vertical thickness of the underline
-    print('Underline thickness :', font.underline_thickness)
-
-for style in ('Italic',
-              'Bold',
-              'Scalable',
-              'Fixed sizes',
-              'Fixed width',
-              'SFNT',
-              'Horizontal',
-              'Vertical',
-              'Kerning',
-              'Fast glyphs',
-              'Multiple masters',
-              'Glyph names',
-              'External stream'):
-    bitpos = getattr(ft, style.replace(' ', '_').upper()) - 1
-    print('%-17s:' % style, bool(font.style_flags & (1 << bitpos)))
-
-print(dir(font))
-
-print(font.get_kerning)
+from matplotlib import font_manager, _ft2
+
+
+fname = matplotlib.get_data_path() + "/fonts/ttf/DejaVuSans-Oblique.ttf"
+font = font_manager.get_font(fname)
+
+print("Faces in file          :", font.num_faces)
+print("Glyphs in face         :", font.num_glyphs)
+print("Family name            :", font.family_name)
+print("Style name             :", font.style_name)
+print("Postscript name        :", font.get_postscript_name())
+print("Embedded bitmap strikes:", font.num_fixed_sizes)
+
+if font.face_flags & _ft2.FACE_FLAG_SCALABLE:
+    print('Global bbox (xmin, ymin, xmax, ymax):', font.bbox)
+    print('Font units per EM                   :', font.units_per_EM)
+    print('Ascender (pixels)                   :', font.ascender)
+    print('Descender (pixels)                  :', font.descender)
+    print('Height (pixels)                     :', font.height)
+    print('Max horizontal advance              :', font.max_advance_width)
+    print('Max vertical advance                :', font.max_advance_height)
+    print('Underline position                  :', font.underline_position)
+    print('Underline thickness                 :', font.underline_thickness)
+
+for style in ['Style flag italic',
+              'Style flag bold']:
+    flag = getattr(_ft2, style.replace(' ', '_').upper()) - 1
+    print('%-26s:' % style, bool(font.style_flags & flag))
+
+for style in ['Face flag scalable',
+              'Face flag fixed sizes',
+              'Face flag fixed width',
+              'Face flag SFNT',
+              'Face flag horizontal',
+              'Face flag vertical',
+              'Face flag kerning',
+              'Face flag fast glyphs',
+              'Face flag multiple masters',
+              'Face flag glyph names',
+              'Face flag external stream']:
+    flag = getattr(_ft2, style.replace(' ', '_').upper())
+    print('%-26s:' % style, bool(font.face_flags & flag))
@@ -15,7 +15,7 @@
 import os
 
 import matplotlib
-from matplotlib.ft2font import FT2Font
+from matplotlib import _ft2
 from matplotlib.font_manager import FontProperties
 import matplotlib.pyplot as plt
 
@@ -35,8 +35,8 @@
     fontname = os.path.join(matplotlib.get_data_path(),
                             'fonts', 'ttf', 'DejaVuSans.ttf')
 
-font = FT2Font(fontname)
-codes = sorted(font.get_charmap().items())
+font = _ft2.Face(fontname)
+codes = sorted(font.get_charmap().items())  # FIXME
 
 # a 16,16 array of character strings
 chars = [['' for c in range(16)] for r in range(16)]
 
@@ -12,7 +12,7 @@
  * alpha blending
  * DPI scaling properly - everything scales properly (dashes, linewidths, etc)
  * draw polygon
- * freetype2 w/ ft2font
+ * freetype2
 
 TODO:
 
@@ -28,20 +28,16 @@
 import numpy as np
 from collections import OrderedDict
 from math import radians, cos, sin
-from matplotlib import rcParams, __version__
+
+from matplotlib import (
+    _ft2, _png, colors as mcolors, font_manager, rcParams, __version__)
 from matplotlib.backend_bases import (
     _Backend, FigureCanvasBase, FigureManagerBase, RendererBase, cursors)
+from matplotlib.backends._backend_agg import RendererAgg as _RendererAgg
 from matplotlib.figure import Figure
-from matplotlib.font_manager import findfont, get_font
-from matplotlib.ft2font import (LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING,
-                                LOAD_DEFAULT, LOAD_NO_AUTOHINT)
 from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Bbox, BboxBase
-from matplotlib import colors as mcolors
-
-from matplotlib.backends._backend_agg import RendererAgg as _RendererAgg
-from matplotlib import _png
 
 try:
     from PIL import Image
@@ -53,12 +49,12 @@
 
 def get_hinting_flag():
     mapping = {
-        True: LOAD_FORCE_AUTOHINT,
-        False: LOAD_NO_HINTING,
-        'either': LOAD_DEFAULT,
-        'native': LOAD_NO_AUTOHINT,
-        'auto': LOAD_FORCE_AUTOHINT,
-        'none': LOAD_NO_HINTING
+        True: _ft2.LOAD_FORCE_AUTOHINT,
+        False: _ft2.LOAD_NO_HINTING,
+        'either': _ft2.LOAD_DEFAULT,
+        'native': _ft2.LOAD_NO_AUTOHINT,
+        'auto': _ft2.LOAD_FORCE_AUTOHINT,
+        'none': _ft2.LOAD_NO_HINTING
         }
     return mapping[rcParams['text.hinting']]
 
@@ -106,9 +102,9 @@ def __setstate__(self, state):
 
     def _get_hinting_flag(self):
         if rcParams['text.hinting']:
-            return LOAD_FORCE_AUTOHINT
+            return _ft2.LOAD_FORCE_AUTOHINT
         else:
-            return LOAD_NO_HINTING
+            return _ft2.LOAD_NO_HINTING
 
     # for filtering to work with rasterization, methods needs to be wrapped.
     # maybe there is better way to do it.
@@ -177,7 +173,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
         yd = descent * cos(radians(angle))
         x = np.round(x + ox + xd)
         y = np.round(y - oy + yd)
-        self._renderer.draw_text_image(font_image, x, y + 1, angle, gc)
+        self._renderer.draw_text_image(font_image, x, y, angle, gc)
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         """
@@ -191,24 +187,15 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
 
         if font is None:
             return None
-        if len(s) == 1 and ord(s) > 127:
-            font.load_char(ord(s), flags=flags)
-        else:
-            # We pass '0' for angle here, since it will be rotated (in raster
-            # space) in the following call to draw_text_image).
-            font.set_text(s, 0, flags=flags)
-        font.draw_glyphs_to_bitmap(antialiased=rcParams['text.antialiased'])
-        d = font.get_descent() / 64.0
+        layout = _ft2.Layout.simple(s, font, flags)
+        d = -np.floor(layout.yMin)
         # The descent needs to be adjusted for the angle
-        xo, yo = font.get_bitmap_offset()
-        xo /= 64.0
-        yo /= 64.0
         xd = -d * sin(radians(angle))
         yd = d * cos(radians(angle))
 
-        #print x, y, int(x), int(y), s
         self._renderer.draw_text_image(
-            font, np.round(x - xd + xo), np.round(y + yd + yo) + 1, angle, gc)
+            layout.render(),  # FIXME Antialiasing.
+            np.round(x - xd), np.round(y + yd), angle, gc)
 
     def get_text_width_height_descent(self, s, prop, ismath):
         """
@@ -232,13 +219,10 @@ def get_text_width_height_descent(self, s, prop, ismath):
 
         flags = get_hinting_flag()
         font = self._get_agg_font(prop)
-        font.set_text(s, 0.0, flags=flags)  # the width and height of unrotated string
-        w, h = font.get_width_height()
-        d = font.get_descent()
-        w /= 64.0  # convert from subpixels
-        h /= 64.0
-        d /= 64.0
-        return w, h, d
+        layout = _ft2.Layout.simple(s, font, flags)
+        return (layout.xMax - layout.xMin,
+                layout.yMax - layout.yMin,
+                -layout.yMin)
 
     def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
         # todo, handle props, angle, origins
@@ -265,13 +249,10 @@ def _get_agg_font(self, prop):
         """
         Get the font for text instance t, cacheing for efficiency
         """
-        fname = findfont(prop)
-        font = get_font(fname)
-
-        font.clear()
+        fname = font_manager.findfont(prop)
+        font = font_manager.get_font(fname)
         size = prop.get_size_in_points()
-        font.set_size(size, self.dpi)
-
+        font.set_char_size(size, self.dpi)
         return font
 
     def points_to_pixels(self, points):