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

Don't let elements that are only allowed once show up more than once.

Browse Source 
git-svn-id: http://svn.robofab.com/branches/ufo3k@339 b5fa9d6c-a76f-4ffd-b3cb-f825fc41095c
This commit is contained in:
Tal Leming 2011-09-29 14:21:02 +00:00
parent 1c2b94ae3b
commit 2330e7d2af
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Lib/ufoLib/glifLib.py
View File

@ -333,7 +333,7 @@ class GlyphSet(object):
if formatVersion == 2 and self.ufoFormatVersion < 3: if formatVersion == 2 and self.ufoFormatVersion < 3:
raise GlifLibError("Unsupported GLIF format version (%d) for UFO format version %d." % (formatVersion, self.ufoFormatVersion)) raise GlifLibError("Unsupported GLIF format version (%d) for UFO format version %d." % (formatVersion, self.ufoFormatVersion))
self._purgeCachedGLIF(glyphName) self._purgeCachedGLIF(glyphName)
data = writeGlyphToString(glyphName, glyphObject, drawPointsFunc, formatVersion=glifFormatVersion) data = writeGlyphToString(glyphName, glyphObject, drawPointsFunc, formatVersion=formatVersion)
fileName = self.contents.get(glyphName) fileName = self.contents.get(glyphName)
if fileName is None: if fileName is None:
fileName = self.glyphNameToFileName(glyphName, self) fileName = self.glyphNameToFileName(glyphName, self)
@ -460,7 +460,8 @@ def writeGlyphToString(glyphName, glyphObject=None, drawPointsFunc=None, writer=
The 'glyphObject' argument can be any kind of object (even None); The 'glyphObject' argument can be any kind of object (even None);
the writeGlyphToString() method will attempt to get the following the writeGlyphToString() method will attempt to get the following
attributes from it: attributes from it:
"width" the advance with of the glyph "width" the advance width of the glyph
"height" the advance height of the glyph
"unicodes" a list of unicode values for this glyph "unicodes" a list of unicode values for this glyph
"note" a string "note" a string
"lib" a dictionary containing custom data "lib" a dictionary containing custom data
@ -661,15 +662,21 @@ def _readGlyphFromTree(tree, glyphObject=None, pointPen=None):
# populate the sub elements # populate the sub elements
unicodes = [] unicodes = []
guidelines = [] guidelines = []
haveSeenImage = False haveSeenAdvance = haveSeenImage = haveSeenOutline = haveSeenLib = haveSeenNote = False
identifiers = set() identifiers = set()
for element, attrs, children in tree[2]: for element, attrs, children in tree[2]:
if element == "outline": if element == "outline":
if haveSeenOutline:
raise GlifLibError("The outline element occurs more than once.")
haveSeenOutline = True
if pointPen is not None: if pointPen is not None:
buildOutline(pointPen, children, formatVersion, identifiers) buildOutline(pointPen, children, formatVersion, identifiers)
elif glyphObject is None: elif glyphObject is None:
continue continue
elif element == "advance": elif element == "advance":
if haveSeenAdvance:
raise GlifLibError("The advance element occurs more than once.")
haveSeenAdvance = True
width = _number(attrs.get("width", 0)) width = _number(attrs.get("width", 0))
_relaxedSetattr(glyphObject, "width", width) _relaxedSetattr(glyphObject, "width", width)
height = _number(attrs.get("height", 0)) height = _number(attrs.get("height", 0))
@ -700,6 +707,9 @@ def _readGlyphFromTree(tree, glyphObject=None, pointPen=None):
raise GlifLibError("The image element is not properly formatted.") raise GlifLibError("The image element is not properly formatted.")
_relaxedSetattr(glyphObject, "image", image) _relaxedSetattr(glyphObject, "image", image)
elif element == "note": elif element == "note":
if haveSeenNote:
raise GlifLibError("The note element occurs more than once.")
haveSeenNote = True
# XXX validate? # XXX validate?
rawNote = "\n".join(children) rawNote = "\n".join(children)
lines = rawNote.split("\n") lines = rawNote.split("\n")
@ -707,6 +717,9 @@ def _readGlyphFromTree(tree, glyphObject=None, pointPen=None):
note = "\n".join(lines) note = "\n".join(lines)
_relaxedSetattr(glyphObject, "note", note) _relaxedSetattr(glyphObject, "note", note)
elif element == "lib": elif element == "lib":
if haveSeenLib:
raise GlifLibError("The lib element occurs more than once.")
haveSeenLib = True
# XXX validate? # XXX validate?
from plistFromTree import readPlistFromTree from plistFromTree import readPlistFromTree
assert len(children) == 1 assert len(children) == 1