commit 60eb80455e6b574c5074a9b4a2e7504a283175dc
author Behdad Esfahbod <behdad@behdad.org> Fri Sep 20 16:34:58 2013 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon Sep 30 15:10:43 2013 -0400
tree 6365f59112a23ff671fc58e83ba55a91ddc93fa2
parent 436503372a7a4aeb529a360e66114ce1b1b6d9ce

[merge] Minor

Lib/fontTools/merge.py

diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py
index f6e56a9..c2e6b1e 100644
--- a/Lib/fontTools/merge.py
+++ b/Lib/fontTools/merge.py
@@ -140,7 +140,7 @@
 	     ttLib.getTableClass('fpgm'),
 	     ttLib.getTableClass('cvt '))
 def merge(self, m):
-	return False # Will be computed automatically
+	return False # TODO We don't merge hinting data currently.
 
 @_add_method(ttLib.getTableClass('cmap'))
 def merge(self, m):
@@ -168,7 +168,7 @@
 @_add_method(ttLib.getTableClass('GDEF'))
 def merge(self, m):
 	self.table = otTables.GDEF()
-	self.table.Version = 1.0
+	self.table.Version = 1.0 # TODO version 1.2...
 
 	if any(t.table.LigCaretList for t in m.tables):
 		glyphs = []