From d29f289911059d042cc8d0044e4dafc9a1125677 Mon Sep 17 00:00:00 2001 From: Just Date: Tue, 14 Mar 2000 23:03:53 +0000 Subject: [PATCH] - some method name changes - check for 3,0 platform/encoding wide strings git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@92 4cde692c-a291-49d1-8350-778aa11640f8 --- Lib/fontTools/ttLib/tables/_n_a_m_e.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/fontTools/ttLib/tables/_n_a_m_e.py b/Lib/fontTools/ttLib/tables/_n_a_m_e.py index cc76bf212..62bd14601 100644 --- a/Lib/fontTools/ttLib/tables/_n_a_m_e.py +++ b/Lib/fontTools/ttLib/tables/_n_a_m_e.py @@ -24,7 +24,7 @@ class table__n_a_m_e(DefaultTable.DefaultTable): self.names = [] for i in range(n): name, data = sstruct.unpack2(nameRecordFormat, data, NameRecord()) - name.fixlongs() + name.fixLongs() name.string = stringData[name.offset:name.offset+name.length] assert len(name.string) == name.length #if (name.platEncID, name.platformID) in ((0, 0), (1, 3)): @@ -65,7 +65,7 @@ class table__n_a_m_e(DefaultTable.DefaultTable): self.names.append(name) name.fromXML((name, attrs, content), ttFont) - def getname(self, nameID, platformID, platEncID, langID=None): + def getName(self, nameID, platformID, platEncID, langID=None): for namerecord in self.names: if ( namerecord.nameID == nameID and namerecord.platformID == platformID and @@ -88,7 +88,7 @@ class NameRecord: ("langID", hex(self.langID)), ]) writer.newline() - if self.platformID == 0 or (self.platformID == 3 and self.platEncID == 1): + if self.platformID == 0 or (self.platformID == 3 and self.platEncID in (0, 1)): writer.write16bit(self.string) else: writer.write8bit(self.string) @@ -129,7 +129,7 @@ class NameRecord: return "" % ( self.nameID, self.platformID, self.langID) - def fixlongs(self): + def fixLongs(self): """correct effects from bug in Python 1.5.1, where "H" returns a Python Long int. This has been fixed in Python 1.5.2.