merging fixes & changes from delft-sprint-2012
git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@611 4cde692c-a291-49d1-8350-778aa11640f8
diff --git a/Lib/fontTools/ttLib/tables/ttProgram.py b/Lib/fontTools/ttLib/tables/ttProgram.py
index ec828a5..32e1dd2 100644
--- a/Lib/fontTools/ttLib/tables/ttProgram.py
+++ b/Lib/fontTools/ttLib/tables/ttProgram.py
@@ -258,7 +258,7 @@
def fromXML(self, (name, attrs, content), ttFont):
if name == "assembly":
- self.fromAssembly(content)
+ self.fromAssembly(string.join(content, ""))
self._assemble()
del self.assembly
else:
@@ -270,7 +270,7 @@
binary2num=binary2num):
assembly = self.assembly
if type(assembly) == type([]):
- assembly = string.join(assembly, "")
+ assembly = string.join(assembly, " ")
bytecode = []
push = bytecode.append
lenAssembly = len(assembly)