Copy ahem font

Author: goanpeca

colosseum/constants.py

@@ -351,15 +351,15 @@ def _available_font_families_mac():
     NSFontManager.declare_class_property("sharedFontManager")
     NSFontManager.declare_property("availableFontFamilies")
     manager = NSFontManager.sharedFontManager
-    return list(sorted(str(item) for item in manager.availableFontFamilies))
+    return list(sorted(str(item) for item in manager.availableFontFamilies if item))
 
 
 def _available_font_families_unix():
     """List available font family names on unix."""
     import subprocess
     p = subprocess.check_output(['fc-list', ':', 'family'])
     fonts = p.decode().split('\n')
-    return list(sorted(set(fonts)))
+    return list(sorted(set(item for item in fonts if item)))
 
 
 AVAILABLE_FONT_FAMILIES = available_font_families()

colosseum/validators.py

@@ -124,9 +124,8 @@ def is_font_family(value=None, generic_family=None, font_families=None):
     font_families = font_families or []
 
     def validator(font_value):
-        print(font_families)
         font_value = ' '.join(font_value.strip().split())
-        values = [v.strip() for v in font_value.split(',') if v.strip()]
+        values = [v.strip() for v in font_value.split(',')]
         checked_values = []
         for val in values:
             # Remove extra inner spaces

tests/test_fonts.py

@@ -22,7 +22,7 @@
         'line_height': 'normal',
         'font_family': ['sans-serif'],
         },
-    r'bold italic large Palatino, serif': {
+    r'bold italic large Ahem, serif': {
         'font_style': 'italic',
         'font_variant': 'normal',
         'font_weight': 'bold',
@@ -38,13 +38,13 @@
         'line_height': '120%',
         'font_family': ['fantasy'],
         },
-    r'x-large/110% "Arial Black",serif': {
+    r'x-large/110% "DejaVu Sans",serif': {
         'font_style': 'normal',
         'font_variant': 'normal',
         'font_weight': 'normal',
         'font_size': 'x-large',
         'line_height': '110%',
-        'font_family': ['"Arial Black"', 'serif'],
+        'font_family': ['"DejaVu Sans"', 'serif'],
         },
 }
 
@@ -58,7 +58,7 @@ def test_parse_font_shorthand(self):
 
         # Test extra spaces
         parse_font_property(r'  normal    normal    normal    12px/12px   serif  ')
-        parse_font_property(r'  normal    normal    normal    12px/12px   "  Arial   Black  ",   serif  ')
+        parse_font_property(r'  normal    normal    normal    12px/12px   "  DejaVu   Sans  ",   serif  ')
 
         # Test valid single part
         for part in SYSTEM_FONT_KEYWORDS:

tests/test_validators.py

@@ -44,10 +44,10 @@ def test_number(self):
 
 class FontTests(TestCase):
     def test_font_family_name_valid(self):
-        validator = is_font_family(generic_family=GENERIC_FAMILY_FONTS, font_families=['Arial Black'])
-        self.assertEqual(validator('"Arial Black", serif'), ['"Arial Black"', 'serif'])
-        self.assertEqual(validator("'Arial Black',fantasy"), ["'Arial Black'", 'fantasy'])
-        self.assertEqual(validator("  '   Arial    Black   '   ,    fantasy  "), ["'Arial Black'", 'fantasy'])
+        validator = is_font_family(generic_family=GENERIC_FAMILY_FONTS, font_families=['DejaVu Sans'])
+        self.assertEqual(validator('"DejaVu Sans", serif'), ['"DejaVu Sans"', 'serif'])
+        self.assertEqual(validator("'DejaVu Sans',fantasy"), ["'DejaVu Sans'", 'fantasy'])
+        self.assertEqual(validator("  '   DejaVu   Sans   '   ,    fantasy  "), ["'DejaVu Sans'", 'fantasy'])
 
     def test_font_family_name_invalid(self):
         validator = is_font_family(generic_family=GENERIC_FAMILY_FONTS)