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

[_g_l_y_f/ttProgram] Move writer.newline() to Program.toXML()

Browse Source
This commit is contained in:
Cosimo Lupo 2017-01-24 13:58:34 +00:00
parent 828a58aacb
commit 499bc960f9
No known key found for this signature in database
GPG Key ID: B61AAAD0B53A6419
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,6 @@ class Glyph(object):
writer.begintag("instructions") writer.begintag("instructions")
writer.newline() writer.newline()
self.program.toXML(writer, ttFont) self.program.toXML(writer, ttFont)
writer.newline()
writer.endtag("instructions") writer.endtag("instructions")
writer.newline() writer.newline()
else: else:
@ -379,7 +378,6 @@ class Glyph(object):
writer.begintag("instructions") writer.begintag("instructions")
writer.newline() writer.newline()
self.program.toXML(writer, ttFont) self.program.toXML(writer, ttFont)
writer.newline()
writer.endtag("instructions") writer.endtag("instructions")
writer.newline() writer.newline()

3
Lib/fontTools/ttLib/tables/ttProgram.py
View File

@ -246,6 +246,7 @@ class Program(object):
writer.newline() writer.newline()
writer.dumphex(self.getBytecode()) writer.dumphex(self.getBytecode())
writer.endtag("bytecode") writer.endtag("bytecode")
writer.newline()
else: else:
writer.begintag("assembly") writer.begintag("assembly")
writer.newline() writer.newline()
@ -279,11 +280,13 @@ class Program(object):
if _indentRE.match(instr): if _indentRE.match(instr):
indent += 1 indent += 1
writer.endtag("assembly") writer.endtag("assembly")
writer.newline()
else: else:
writer.begintag("bytecode") writer.begintag("bytecode")
writer.newline() writer.newline()
writer.dumphex(self.getBytecode()) writer.dumphex(self.getBytecode())
writer.endtag("bytecode") writer.endtag("bytecode")
writer.newline()
def fromXML(self, name, attrs, content, ttFont): def fromXML(self, name, attrs, content, ttFont):
if name == "assembly": if name == "assembly":