shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mtiLib] Ignore trailing tabs

Browse Source
This commit is contained in:
Behdad Esfahbod 2016-04-27 16:55:56 -07:00
parent 973270e7f9
commit 71633457df
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/fontTools/mtiLib/__init__.py
View File

@ -683,6 +683,7 @@ def parseContext(self, lines, font, Type, lookupMap=None):
rules = [] rules = []
for line in lines: for line in lines:
assert line[0].lower() == 'glyph', line[0] assert line[0].lower() == 'glyph', line[0]
while len(line) < 1+c.DataLen: line.append('')
seq = tuple(makeGlyphs(stripSplitComma(i)) for i in line[1:1+c.DataLen]) seq = tuple(makeGlyphs(stripSplitComma(i)) for i in line[1:1+c.DataLen])
recs = parseLookupRecords(line[1+c.DataLen:], c.LookupRecord, lookupMap) recs = parseLookupRecords(line[1+c.DataLen:], c.LookupRecord, lookupMap)
rules.append((seq, recs)) rules.append((seq, recs))
@ -713,6 +714,7 @@ def parseContext(self, lines, font, Type, lookupMap=None):
rules = [] rules = []
for line in lines: for line in lines:
assert line[0].lower().startswith('class'), line[0] assert line[0].lower().startswith('class'), line[0]
while len(line) < 1+c.DataLen: line.append('')
seq = tuple(intSplitComma(i) for i in line[1:1+c.DataLen]) seq = tuple(intSplitComma(i) for i in line[1:1+c.DataLen])
recs = parseLookupRecords(line[1+c.DataLen:], c.LookupRecord, lookupMap) recs = parseLookupRecords(line[1+c.DataLen:], c.LookupRecord, lookupMap)
rules.append((seq, recs)) rules.append((seq, recs))
@ -991,12 +993,12 @@ class Tokenizer(object):
def __init__(self, f): def __init__(self, f):
# TODO BytesIO / StringIO as needed? also, figure out whether we work on bytes or unicode # TODO BytesIO / StringIO as needed? also, figure out whether we work on bytes or unicode
lines = iter(f) lines = iter(f)
lines = ([s.strip() for s in line.split('\t')] for line in lines)
try: try:
self.filename = f.name self.filename = f.name
except: except:
self.filename = None self.filename = None
self.lines = lines self.lines = iter(lines)
self.line = ''
self.lineno = 0 self.lineno = 0
self.stoppers = [] self.stoppers = []
self.buffer = None self.buffer = None
@ -1006,7 +1008,9 @@ class Tokenizer(object):
def _next_line(self): def _next_line(self):
self.lineno += 1 self.lineno += 1
return next(self.lines) line = self.line = next(self.lines)
return [s.strip() for s in line.rstrip().split('\t')]
def _next_nonempty(self): def _next_nonempty(self):
while True: while True: