Initial version of the new FontTTF class

Author: a-hurst

doc/modules/ext/ttf.rst

@@ -1,7 +1,16 @@
 .. currentmodule:: sdl2.ext
 
-TrueType Text rendering routines
-================================
+`sdl2.ext.ttf` - Rendering Text With TrueType Fonts
+===================================================
+
+The :mod:`sdl2.ext.ttf` module provides the :class:`~sdl2.ext.FontTTF` class,
+which provides a friendly and Pythonic API for font rendering based around
+the **SDL_ttf** library. **SDL_ttf** can be installed as a Python dependency
+with ``pysdl2-dll`` on platforms that support it).
+
+Additionally, this module provides the deprecated :class:`~sdl2.ext.FontManager`
+class, which provides a different (and less featureful) API for rendering text
+using **SDL_ttf**.
 
 .. automodule:: sdl2.ext.ttf
 	:members:

doc/modules/sdl2ext.rst

@@ -34,7 +34,6 @@ and/or unpleasant parts of the SDL2 API. At present, these modules include:
 	ext/window.rst
 	ext/renderer.rst
 	ext/msgbox.rst
-	ext/ttf.rst
 
 
 Utilities for working with SDL2 in Python
@@ -68,6 +67,7 @@ importing images, and more:
 	ext/surface.rst
 	ext/draw.rst
 	ext/image.rst
+	ext/ttf.rst
 	ext/bitmapfont.rst
 
 

doc/news.rst

@@ -53,6 +53,12 @@ New Features:
   widths and heights for each mapped character in a bitmap font.
 * Added a new argument ``line_h`` to :meth:`sdl2.ext.BitmapFont.render_on` to
   allow specifying custom line heights.
+* Added a new :class:`~sdl2.ext.FontTTF` class, providing a new and flexible
+  Pythonic wrapper around the :mod:`~sdl2.sdlttf` module for opening and
+  rendering text with TrueType and OpenType fonts. New features include custom
+  line heights for multi-line text, left/right/center justification operations
+  for multiline text, and specifying font sizes in units of pixels in addition
+  to pt.
 
 API Changes:
 
@@ -114,6 +120,8 @@ Deprecation Notices:
   :meth:`sdl2.ext.BitmapFont.render_text`, which returns an SDL surface instead
   of a SoftwareSprite and ensures the output surface is in ARGB8888 format by
   default.
+* The :class:`~sdl2.ext.FontManager` class has been deprecated in favor of the
+  new and more flexible :class:`~sdl2.ext.FontTTF` class.
 
 
 0.9.9

sdl2/ext/common.py

@@ -74,7 +74,7 @@ def quit():
     # TODO: More subsystems? Also, is TTF_WasInit always 1?
     SDL_QuitSubSystem(SDL_INIT_VIDEO)
     if SDL_WasInit(0) != 0:
-        if _HASSDLTTF and sdlttf.TTF_WasInit() == 1:
+        if _HASSDLTTF and sdlttf.TTF_WasInit() > 0:
             sdlttf.TTF_Quit()
         if _HASSDLIMAGE:
             sdlimage.IMG_Quit()