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

This commit is contained in:
Ochi Wolfe 2013-09-01 22:14:59 +02:00
parent 70c04baf9c
commit 72d51b7221
4 changed files with 17 additions and 7 deletions

View file

@ -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()
if fontPath == "":
fontName = script.getRawArg()
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":