Font-loading is now done via font name (=name of font folder), updated DejaVu font file

TextureCreator/TextureCreator.py

@@ -24,11 +24,12 @@ SCRIPTS_DIR = "scripts"
 OUTPUT_DIR  = "output"
 
 if not os.path.exists(OUTPUT_DIR):
-	os.mkdir(OUTPUT_DIR)
+    os.mkdir(OUTPUT_DIR)
 
 # Iterate through all directories in the "fonts" directory.
 for fontName in os.listdir(FONTS_DIR):
-    fontFilePaths = glob.glob(os.path.join(FONTS_DIR, fontName, "*.[o,t]tf"))
+    fontFilePaths = glob.glob(os.path.join(FONTS_DIR, fontName, "*.[o,t]tf")) \
+                  + glob.glob(os.path.join(FONTS_DIR, fontName, "*.[O,T]TF"))
     
     # Ignore this font directory is there are no font files inside it.
     if len(fontFilePaths) < 1:

TextureCreator/lib/TexturePainter.py

@@ -14,6 +14,7 @@ writes the result out to an image file.
 '''
 
 import cairo
+import glob
 import itertools
 import math
 import os
@@ -22,7 +23,8 @@ from . import FontFaceCreator
 from . import TGAWriter
 from ScriptReader import ScriptReader
 
-OUTPUT_DIR = "output"
+FONTS_DIR   = "fonts"
+OUTPUT_DIR  = "output"
 SCRIPTS_DIR = "scripts"
 
 class GridConfig:
@@ -149,9 +151,16 @@ class TexturePainter:
                     self.drawChar(char)
             
             elif script.getCmd() == "loadFont":
-                fontPath = script.getRawArg()
+                fontName = script.getRawArg()
-                if fontPath == "":
+                fontPath = ""
+                if fontName == "":
                     fontPath = defaultFont
+                else:
+                    fontFilePaths = glob.glob(os.path.join(FONTS_DIR, fontName, "*.[o,t]tf")) \
+                                  + glob.glob(os.path.join(FONTS_DIR, fontName, "*.[O,T]TF"))
+                    if len(fontFilePaths) < 1:
+                        raise Exception("No font file found for font \"" + fontName + "\".")
+                    fontPath = fontFilePaths[0]
                 self.loadFont(fontPath)
             
             elif script.getCmd() == "jumpToCell":

TextureCreator/scripts/_special.script

@@ -1,6 +1,6 @@
 jumpToCell 0 9
 
-loadFont fonts/DejaVu/DejaVu.ttf
+loadFont DejaVu
 
 drawChars                 ▲◀▼▶○◔◑◕●
 drawChars                 ↑←↓→↺↻☐☑☒
@@ -10,7 +10,7 @@ drawChars      ♪♫♠♣♥♦⚀⚁⚂⚃⚄⚅✔✘☺☹
 
 jumpToCell 24 11
 
-loadFont fonts/FreeSerif/FreeSerif.ttf
+loadFont FreeSerif
 
 drawChars ℹ❌⌖∡⌛⌚