Merge pull request #103 from olivierberten/post4

'post' format 4.0 support

Author: behdad

Lib/fontTools/ttLib/tables/_p_o_s_t.py

@@ -37,6 +37,8 @@ def decompile(self, data, ttFont):
 			self.decode_format_2_0(data, ttFont)
 		elif self.formatType == 3.0:
 			self.decode_format_3_0(data, ttFont)
+		elif self.formatType == 4.0:
+			self.decode_format_4_0(data, ttFont)
 		else:
 			# supported format
 			raise ttLib.TTLibError("'post' table format %f not supported" % self.formatType)
@@ -49,6 +51,8 @@ def compile(self, ttFont):
 			data = data + self.encode_format_2_0(ttFont)
 		elif self.formatType == 3.0:
 			pass # we're done
+		elif self.formatType == 4.0:
+			data = data + self.encode_format_4_0(ttFont)
 		else:
 			# supported format
 			raise ttLib.TTLibError("'post' table format %f not supported" % self.formatType)
@@ -122,6 +126,25 @@ def decode_format_3_0(self, data, ttFont):
 		# try and construct glyph names from a Unicode cmap table.
 		self.glyphOrder = None
 
+	def decode_format_4_0(self, data, ttFont):
+		from fontTools import agl
+		numGlyphs = ttFont['maxp'].numGlyphs
+		indices = array.array("H")
+		indices.fromstring(data)
+		if sys.byteorder != "big":
+			indices.byteswap()
+		# In some older fonts, the size of the post table doesn't match
+		# the number of glyphs. Sometimes it's bigger, sometimes smaller.
+		self.glyphOrder = glyphOrder = [''] * int(numGlyphs)
+		for i in range(min(len(indices),numGlyphs)):
+			if indices[i] == 0xFFFF:
+				self.glyphOrder[i] = ''
+			elif indices[i] in agl.UV2AGL:
+				self.glyphOrder[i] = agl.UV2AGL[indices[i]]
+			else:
+				self.glyphOrder[i] = "uni%04X" % indices[i]
+		self.build_psNameMapping(ttFont)
+
 	def encode_format_2_0(self, ttFont):
 		numGlyphs = ttFont['maxp'].numGlyphs
 		glyphOrder = ttFont.getGlyphOrder()
@@ -150,6 +173,24 @@ def encode_format_2_0(self, ttFont):
 			indices.byteswap()
 		return struct.pack(">H", numGlyphs) + indices.tostring() + packPStrings(extraNames)
 
+	def encode_format_4_0(self, ttFont):
+		from fontTools import agl
+		numGlyphs = ttFont['maxp'].numGlyphs
+		glyphOrder = ttFont.getGlyphOrder()
+		assert len(glyphOrder) == numGlyphs
+		indices = array.array("H")
+		for glyphID in glyphOrder:
+			glyphID = glyphID.split('#')[0]
+			if glyphID in agl.AGL2UV:
+				indices.append(agl.AGL2UV[glyphID])
+			elif len(glyphID) == 7 and glyphID[:3] == 'uni':
+				indices.append(int(glyphID[3:],16))
+			else:
+				indices.append(0xFFFF)
+		if sys.byteorder != "big":
+			indices.byteswap()
+		return indices.tostring()
+
 	def toXML(self, writer, ttFont):
 		formatstring, names, fixes = sstruct.getformat(postFormat)
 		for name in names: