Merge pull request #297 from anthrotype/fix_bitmaps

[E_B_D_T_] make 'bitmaps' directory in the same location as output TTX file
This commit is contained in:
Cosimo Lupo 2015-06-25 10:54:18 +02:00
commit 63ebca3ada

View File

@ -338,15 +338,20 @@ def _readBitwiseImageData(bitmapObject, name, attrs, content, ttFont):
bitmapObject.setRows(dataRows, bitDepth=bitDepth, metrics=metrics, reverseBytes=True) bitmapObject.setRows(dataRows, bitDepth=bitDepth, metrics=metrics, reverseBytes=True)
def _writeExtFileImageData(strikeIndex, glyphName, bitmapObject, writer, ttFont): def _writeExtFileImageData(strikeIndex, glyphName, bitmapObject, writer, ttFont):
folder = 'bitmaps/' try:
folder = os.path.dirname(writer.file.name)
except AttributeError:
# fall back to current directory if output file's directory isn't found
folder = '.'
folder = os.path.join(folder, 'bitmaps')
filename = glyphName + bitmapObject.fileExtension filename = glyphName + bitmapObject.fileExtension
if not os.path.isdir(folder): if not os.path.isdir(folder):
os.makedirs(folder) os.makedirs(folder)
folder += 'strike%d/' % strikeIndex folder = os.path.join(folder, 'strike%d' % strikeIndex)
if not os.path.isdir(folder): if not os.path.isdir(folder):
os.makedirs(folder) os.makedirs(folder)
fullPath = folder + filename fullPath = os.path.join(folder, filename)
writer.simpletag('extfileimagedata', value=fullPath) writer.simpletag('extfileimagedata', value=fullPath)
writer.newline() writer.newline()