Merge pull request kivy#2673 from kivy/system_fonts

System fonts

Author: tito

kivy/core/text/__init__.py

@@ -39,10 +39,11 @@
 from functools import partial
 from copy import copy
 from kivy import kivy_data_dir
+from kivy.utils import platform
 from kivy.graphics.texture import Texture
 from kivy.core import core_select_lib
 from kivy.core.text.text_layout import layout_text, LayoutWord
-from kivy.resources import resource_find
+from kivy.resources import resource_find, resource_add_path
 from kivy.compat import PY2
 
 DEFAULT_FONT = 'DroidSans'
@@ -136,6 +137,8 @@ class LabelBase(object):
 
     _fonts_cache = {}
 
+    _fonts_dirs = []
+
     _texture_1px = None
 
     def __init__(self, text='', font_size=12, font_name=DEFAULT_FONT,
@@ -144,6 +147,10 @@ def __init__(self, text='', font_size=12, font_name=DEFAULT_FONT,
                  line_height=1.0, strip=False, shorten_from='center',
                  split_str=' ', unicode_errors='replace', **kwargs):
 
+        # Include system fonts_dir in resource paths.
+        # This allows us to specify a font from those dirs.
+        LabelBase.get_system_fonts_dir()
+
         options = {'text': text, 'font_size': font_size,
                    'font_name': font_name, 'bold': bold, 'italic': italic,
                    'halign': halign, 'valign': valign, 'shorten': shorten,
@@ -229,6 +236,11 @@ def resolve_font_name(self):
             options['font_name_r'] = fontscache[fontname]
         else:
             filename = resource_find(fontname)
+            if not filename:
+                fontname = fontname + \
+                    ('' if fontname.endswith('.ttf') else '.ttf')
+                filename = resource_find(fontname)
+
             if filename is None:
                 # XXX for compatibility, check directly in the data dir
                 filename = os.path.join(kivy_data_dir, fontname)
@@ -237,6 +249,41 @@ def resolve_font_name(self):
             fontscache[fontname] = filename
             options['font_name_r'] = filename
 
+    @staticmethod
+    def get_system_fonts_dir():
+        '''Return the Directory used by the system for fonts.
+        '''
+        if LabelBase._fonts_dirs:
+            return LabelBase._fonts_dirs
+
+        fdirs = []
+        if platform == 'linux':
+            fdirs = [
+                '/usr/share/fonts/truetype', '/usr/local/share/fonts',
+                os.path.expanduser('~/.fonts'),
+                os.path.expanduser('~/.local/share/fonts')]
+        elif platform == 'macosx':
+            fdirs = ['/Library/Fonts', '/System/Library/Fonts',
+                os.path.expanduser('~/Library/Fonts')]
+        elif platform == 'win':
+            fdirs = [os.environ['SYSTEMROOT'] + os.sep + 'Fonts']
+        elif platform == 'ios':
+            fdirs = ['/Systiem/Library/Fonts']
+        elif platform == 'android':
+            fdirs = ['/system/fonts']
+
+        if fdirs:
+            fdirs.append(kivy_data_dir + os.sep + 'fonts')
+            # let's register the font dirs
+            rdirs = []
+            for _dir in fdirs:
+                if os.path.exists(_dir):
+                    resource_add_path(_dir)
+                    rdirs.append(_dir)
+            LabelBase._fonts_dirs = rdirs
+            return rdirs
+        raise Exception("Unknown Platform {}".format(platform))
+
     def get_extents(self, text):
         '''Return a tuple (width, height) indicating the size of the specified
         text'''
@@ -695,3 +742,4 @@ def _set_text_size(self, x):
                    'data/fonts/DroidSans-Italic.ttf',
                    'data/fonts/DroidSans-Bold.ttf',
                    'data/fonts/DroidSans-BoldItalic.ttf')
+

kivy/core/text/_text_sdl2.pyx

@@ -104,14 +104,16 @@ cdef TTF_Font *_get_font(self):
 
     # fallback to search a system font
     if fontobject == NULL:
-        s_error = (<bytes>SDL_GetError()).decode('utf-8')
+        s_error = (<bytes>SDL_GetError()).encode('utf-8')
         print(s_error)
         assert(0)
+
     sdl2_cache[fontid] = ttfc = _TTFContainer()
     ttfc.font = fontobject
     sdl2_cache_order.append(fontid)
 
     # to prevent too much file open, limit the number of opened fonts to 64
+
     while len(sdl2_cache_order) > 64:
         popid = sdl2_cache_order.pop(0)
         ttfc = sdl2_cache[popid]