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

[glyf] make splitGlyphs output more compact

Browse Source 
removed a few extra newlines
This commit is contained in:
Cosimo Lupo 2017-11-23 19:05:30 +01:00
parent bd030f61c6
commit d08d635a93
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Lib/fontTools/ttLib/tables/_g_l_y_f.py
View File

@ -119,12 +119,15 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
return data return data
def toXML(self, writer, ttFont, progress=None, splitGlyphs=False): def toXML(self, writer, ttFont, progress=None, splitGlyphs=False):
notice = (
writer.newline() "The xMin, yMin, xMax and yMax values\n"
"will be recalculated by the compiler.")
glyphNames = ttFont.getGlyphNames() glyphNames = ttFont.getGlyphNames()
writer.comment("The xMin, yMin, xMax and yMax values\nwill be recalculated by the compiler.") if not splitGlyphs:
writer.newline() writer.newline()
writer.newline() writer.comment(notice)
writer.newline()
writer.newline()
counter = 0 counter = 0
progressStep = 10 progressStep = 10
numGlyphs = len(glyphNames) numGlyphs = len(glyphNames)
@ -139,16 +142,16 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
path, ext = os.path.splitext(writer.file.name) path, ext = os.path.splitext(writer.file.name)
fileNameTemplate = path + ".%s" + ext fileNameTemplate = path + ".%s" + ext
glyphPath = fileNameTemplate % nameToIdentifier(glyphName) glyphPath = fileNameTemplate % nameToIdentifier(glyphName)
glyphWriter = xmlWriter.XMLWriter(glyphPath, idlefunc=writer.idlefunc, glyphWriter = xmlWriter.XMLWriter(
newlinestr=writer.newlinestr) glyphPath, idlefunc=writer.idlefunc,
newlinestr=writer.newlinestr)
glyphWriter.begintag("ttFont", ttLibVersion=version) glyphWriter.begintag("ttFont", ttLibVersion=version)
glyphWriter.newline() glyphWriter.newline()
glyphWriter.newline()
glyphWriter.begintag("glyf") glyphWriter.begintag("glyf")
glyphWriter.newline() glyphWriter.newline()
glyphWriter.comment(notice)
glyphWriter.newline() glyphWriter.newline()
writer.simpletag("TTGlyph", src=os.path.basename(glyphPath)) writer.simpletag("TTGlyph", src=os.path.basename(glyphPath))
writer.newline()
else: else:
glyphWriter = writer glyphWriter = writer
glyphWriter.begintag('TTGlyph', [ glyphWriter.begintag('TTGlyph', [
@ -171,7 +174,8 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
else: else:
writer.simpletag('TTGlyph', name=glyphName) writer.simpletag('TTGlyph', name=glyphName)
writer.comment("contains no outline data") writer.comment("contains no outline data")
writer.newline() if not splitGlyphs:
writer.newline()
writer.newline() writer.newline()
def fromXML(self, name, attrs, content, ttFont): def fromXML(self, name, attrs, content, ttFont):