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

Remove most uses of module string

Browse Source
This commit is contained in:
Behdad Esfahbod 2013-11-27 05:47:34 -05:00
parent b774f9f684
commit 14fb031125
25 changed files with 82 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/fontTools/afmLib.py
View File

@ -5,7 +5,6 @@
# File Format Specification). Still, it should read most "common" AFM files.
import re
import string
__version__ = "$Id: afmLib.py,v 1.6 2003-05-24 12:50:47 jvr Exp $"
@ -111,7 +110,7 @@ class AFM:
def read(self, path):
lines = readlines(path)
for line in lines:
if not string.strip(line):
if not line.strip():
continue
m = identifierRE.match(line)
if m is None:
@ -119,7 +118,7 @@ class AFM:
pos = m.regs[1][1]
word = line[:pos]
rest = string.strip(line[pos:])
rest = line[pos:].strip()
if word in self._keywords:
continue
if word == "C":
@ -140,7 +139,7 @@ class AFM:
things.append(rest[fr:to])
charname = things[2]
del things[2]
charnum, width, l, b, r, t = [string.atoi(thing) for thing in things]
charnum, width, l, b, r, t = (int(thing) for thing in things)
self._chars[charname] = charnum, width, (l, b, r, t)
def parsekernpair(self, rest):
@ -151,18 +150,18 @@ class AFM:
for fr, to in m.regs[1:]:
things.append(rest[fr:to])
leftchar, rightchar, value = things
value = string.atoi(value)
value = int(value)
self._kerning[(leftchar, rightchar)] = value
def parseattr(self, word, rest):
if word == "FontBBox":
l, b, r, t = [string.atoi(thing) for thing in string.split(rest)]
l, b, r, t = [int(thing) for thing in rest.split()]
self._attrs[word] = l, b, r, t
elif word == "Comment":
self._comments.append(rest)
else:
try:
value = string.atoi(rest)
value = int(rest)
except (ValueError, OverflowError):
self._attrs[word] = rest
else:
@ -194,7 +193,7 @@ class AFM:
import time
lines = [ "StartFontMetrics 2.0",
"Comment Generated by afmLib, version %s; at %s" %
(string.split(__version__)[2],
(__version__.split()[2],
time.strftime("%m/%d/%Y %H:%M:%S",
time.localtime(time.time())))]
@ -351,7 +350,7 @@ def readlines(path):
sep = sep + '\r' # mac or dos
if '\n' in data:
sep = sep + '\n' # unix or dos
return string.split(data, sep)
return data.split(sep)
def writelines(path, lines, sep='\r'):
f = open(path, 'wb')

5
Lib/fontTools/cffLib.py
View File

@ -6,7 +6,6 @@
import struct
from fontTools.misc import sstruct
import string
from fontTools.misc import psCharStrings
from fontTools.misc.textTools import safeEval
@ -896,7 +895,7 @@ def parseCharset0(numGlyphs, file, strings, isCID):
if isCID:
for i in range(numGlyphs - 1):
CID = readCard16(file)
charset.append("cid" + string.zfill(str(CID), 5) )
charset.append("cid" + str(CID).zfill(5))
else:
for i in range(numGlyphs - 1):
SID = readCard16(file)
@ -915,7 +914,7 @@ def parseCharset(numGlyphs, file, strings, isCID, format):
nLeft = nLeftFunc(file)
if isCID:
for CID in range(first, first+nLeft+1):
charset.append("cid" + string.zfill(str(CID), 5) )
charset.append("cid" + str(CID).zfill(5))
else:
for SID in range(first, first+nLeft+1):
charset.append(strings[SID])

3
Lib/fontTools/fondLib.py
View File

@ -1,7 +1,6 @@
import os
import struct
from fontTools.misc import sstruct
import string
try:
from Carbon import Res
except ImportError:
@ -289,7 +288,7 @@ class FontFamily:
for firstchar, secondchar, kerndistance in table:
data.append(struct.pack(">cch", chr(firstchar), chr(secondchar), kerndistance))
data = string.join(data, '')
data = ''.join(data)
if DEBUG:
print("kerning table is the same?", self._rawkerningtables == data and 'yes.' or 'no.')

6
Lib/fontTools/misc/eexec.py
View File

@ -6,8 +6,6 @@ charstring encryption algorithm as used by PostScript Type 1 fonts.
# all four public functions get overridden by the *much* faster
# C extension module eexecOp, if available.
import string
error = "eexec.error"
@ -31,7 +29,7 @@ def decrypt(cipherstring, R):
for cipher in cipherstring:
plain, R = _decryptChar(cipher, R)
plainList.append(plain)
plainstring = string.join(plainList, '')
plainstring = ''.join(plainList)
return plainstring, int(R)
def encrypt(plainstring, R):
@ -39,7 +37,7 @@ def encrypt(plainstring, R):
for plain in plainstring:
cipher, R = _encryptChar(plain, R)
cipherList.append(cipher)
cipherstring = string.join(cipherList, '')
cipherstring = ''.join(cipherList)
return cipherstring, int(R)

7
Lib/fontTools/misc/psCharStrings.py
View File

@ -3,7 +3,6 @@ CFF dictionary data and Type1/Type2 CharStrings.
"""
import struct
import string
DEBUG = 0
@ -374,10 +373,10 @@ class T2CharString(ByteCodeBase):
bits = []
for byte in hintMask:
bits.append(num2binary(ord(byte), 8))
hintMask = string.join(bits, "")
line = string.join(args + [token, hintMask], " ")
hintMask = ''.join(bits)
line = ' '.join(args + [token, hintMask])
else:
line = string.join(args + [token], " ")
line = ' '.join(args + [token])
xmlWriter.write(line)
xmlWriter.newline()
args = []

9
Lib/fontTools/misc/textTools.py
View File

@ -15,13 +15,12 @@ def readHex(content):
def deHexStr(hexdata):
"""Convert a hex string to binary data."""
parts = string.split(hexdata)
hexdata = string.join(parts, "")
hexdata = ''.join(hexdata.split())
if len(hexdata) % 2:
hexdata = hexdata + "0"
data = []
for i in range(0, len(hexdata), 2):
data.append(chr(string.atoi(hexdata[i:i+2], 16)))
data.append(chr(int(hexdata[i:i+2], 16)))
return "".join(data)
@ -51,11 +50,11 @@ def num2binary(l, bits=32):
all.append(bin)
all.reverse()
assert l in (0, -1), "number doesn't fit in number of bits"
return string.join(all, " ")
return ' '.join(all)
def binary2num(bin):
bin = string.join(string.split(bin), "")
bin = ''.join(bin.split())
l = 0
for digit in bin:
l = l << 1

12
Lib/fontTools/misc/xmlWriter.py
View File

@ -58,7 +58,7 @@ class XMLWriter:
def comment(self, data):
data = escape(data)
lines = string.split(data, "\n")
lines = data.split("\n")
self.writeraw("<!-- " + lines[0])
for line in lines[1:]:
self.newline()
@ -121,14 +121,14 @@ class XMLWriter:
def escape(data):
data = string.replace(data, "&", "&amp;")
data = string.replace(data, "<", "&lt;")
data = data.replace("&", "&amp;")
data = data.replace("<", "&lt;")
return data
def escapeattr(data):
data = string.replace(data, "&", "&amp;")
data = string.replace(data, "<", "&lt;")
data = string.replace(data, '"', "&quot;")
data = data.replace("&", "&amp;")
data = data.replace("<", "&lt;")
data = data.replace('"', "&quot;")
return data
def escape8bit(data):

7
Lib/fontTools/nfntLib.py
View File

@ -1,6 +1,5 @@
import struct
from fontTools.misc import sstruct
import string
# FontRec header
@ -71,8 +70,8 @@ class NFNT:
for i in range(nEntries):
owTable[i] = chr(self.offsetTable[i]) + chr(self.widthTable[i])
locTable[i] = struct.pack("h", self.locTable[i])
owTable = string.join(owTable, "")
locTable = string.join(locTable, "")
owTable = ''.join(owTable)
locTable = ''.join(locTable)
assert len(locTable) == len(owTable) == 2 * (self.lastChar - self.firstChar + 3)
return header + self.bits + locTable + owTable
@ -158,7 +157,7 @@ class NFNT:
for x in range(8):
byte = byte | ((bitImage[8 * xByte + x, y] & 0x01) << (7 - x))
bits.append(chr(byte))
bits = string.join(bits, "")
bits = ''.join(bits)
# assign values
self.fontType = 0x9000

23
Lib/fontTools/t1Lib.py
View File

@ -22,7 +22,6 @@ DEBUG = 0
from fontTools.misc import eexec
from fontTools.misc.macCreatorType import getMacCreatorAndType
import string
import re
import os
@ -102,7 +101,7 @@ class T1Font:
def read(path, onlyHeader=0):
"""reads any Type 1 font file, returns raw data"""
normpath = string.lower(path)
normpath = path.lower()
creator, type = getMacCreatorAndType(path)
if type == 'LWFN':
return readLWFN(path, onlyHeader), 'LWFN'
@ -113,7 +112,7 @@ def read(path, onlyHeader=0):
def write(path, data, kind='OTHER', dohex=0):
assertType1(data)
kind = string.upper(kind)
kind = kind.upper()
try:
os.remove(path)
except os.error:
@ -169,7 +168,7 @@ def readLWFN(path, onlyHeader=0):
raise T1Error('bad chunk code: ' + repr(code))
finally:
Res.CloseResFile(resRef)
data = string.join(data, '')
data = ''.join(data)
assertType1(data)
return data
@ -193,7 +192,7 @@ def readPFB(path, onlyHeader=0):
if onlyHeader:
break
f.close()
data = string.join(data, '')
data = ''.join(data)
assertType1(data)
return data
@ -211,7 +210,7 @@ def readOther(path):
data.append(deHexString(chunk))
else:
data.append(chunk)
return string.join(data, '')
return ''.join(data)
# file writing tools
@ -307,23 +306,23 @@ def decryptType1(data):
data.append(chunk[:-len(EEXECBEGIN)-1])
else:
data.append(chunk)
return string.join(data, '')
return ''.join(data)
def findEncryptedChunks(data):
chunks = []
while True:
eBegin = string.find(data, EEXECBEGIN)
eBegin = data.find(EEXECBEGIN)
if eBegin < 0:
break
eBegin = eBegin + len(EEXECBEGIN) + 1
eEnd = string.find(data, EEXECEND, eBegin)
eEnd = data.find(EEXECEND, eBegin)
if eEnd < 0:
raise T1Error("can't find end of eexec part")
cypherText = data[eBegin:eEnd + 2]
if isHex(cypherText[:4]):
cypherText = deHexString(cypherText)
plainText, R = eexec.decrypt(cypherText, 55665)
eEndLocal = string.find(plainText, EEXECINTERNALEND)
eEndLocal = plainText.find(EEXECINTERNALEND)
if eEndLocal < 0:
raise T1Error("can't find end of eexec part")
chunks.append((0, data[:eBegin]))
@ -333,7 +332,7 @@ def findEncryptedChunks(data):
return chunks
def deHexString(hexstring):
return eexec.deHexString(string.join(string.split(hexstring), ""))
return eexec.deHexString(''.join(hexstring.split()))
# Type 1 assertion
@ -348,7 +347,7 @@ def assertType1(data):
raise T1Error("not a PostScript font")
if not _fontType1RE.search(data):
raise T1Error("not a Type 1 font")
if string.find(data, "currentfile eexec") < 0:
if data.find("currentfile eexec") < 0:
raise T1Error("not an encrypted Type 1 font")
# XXX what else?
return data

6
Lib/fontTools/ttLib/__init__.py
View File

@ -47,7 +47,6 @@ Dumping 'prep' table...
import sys
import os
import string
haveMacSupport = 0
if sys.platform == "mac":
@ -500,8 +499,7 @@ class TTFont:
glyphName = agl.UV2AGL[unicode]
else:
# create uni<CODE> name
glyphName = "uni" + string.upper(string.zfill(
hex(unicode)[2:], 4))
glyphName = "uni%04X" % unicode
tempName = glyphName
n = 1
while tempName in allNames:
@ -881,7 +879,7 @@ def tagToXML(tag):
elif tag == "GlyphOrder":
return tag
if re.match("[A-Za-z_][A-Za-z_0-9]* *$", tag):
return string.strip(tag)
return tag.strip()
else:
return tagToIdentifier(tag)

5
Lib/fontTools/ttLib/tables/C_B_D_T_.py
View File

@ -4,7 +4,6 @@
from . import E_B_D_T_
import string
import struct
from fontTools.misc import sstruct
from .BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
@ -51,7 +50,7 @@ class cbdt_bitmap_format_17(BitmapPlusSmallMetricsMixin, ColorBitmapGlyph):
dataList.append(sstruct.pack(smallGlyphMetricsFormat, self.metrics))
dataList.append(struct.pack(">L", len(self.imageData)))
dataList.append(self.imageData)
return string.join(dataList, "")
return ''.join(dataList)
class cbdt_bitmap_format_18(BitmapPlusBigMetricsMixin, ColorBitmapGlyph):
@ -70,7 +69,7 @@ class cbdt_bitmap_format_18(BitmapPlusBigMetricsMixin, ColorBitmapGlyph):
dataList.append(sstruct.pack(bigGlyphMetricsFormat, self.metrics))
dataList.append(struct.pack(">L", len(self.imageData)))
dataList.append(self.imageData)
return string.join(dataList, "")
return ''.join(dataList)
class cbdt_bitmap_format_19(ColorBitmapGlyph):

1
Lib/fontTools/ttLib/tables/DefaultTable.py
View File

@ -1,4 +1,3 @@
import string
import sys
class DefaultTable:

15
Lib/fontTools/ttLib/tables/E_B_D_T_.py
View File

@ -1,7 +1,6 @@
from . import DefaultTable
import os
import string
import struct
from fontTools.misc import sstruct
import itertools
@ -113,7 +112,7 @@ class table_E_B_D_T_(DefaultTable.DefaultTable):
# of any of the problems in the convertion that may arise.
curIndexSubTable.locations = dataLocations
return string.join(dataList, "")
return ''.join(dataList)
def toXML(self, writer, ttFont):
# When exporting to XML if one of the data export formats
@ -212,7 +211,7 @@ def _data2binary(data, numBits):
binaryList.append('0')
value = value >> 1
numBits -= numBitsCut
return string.join(binaryList, "")
return ''.join(binaryList)
def _binary2data(binary):
byteList = []
@ -224,7 +223,7 @@ def _binary2data(binary):
if curBit == '1':
curByte |= 1
byteList.append(chr(curByte))
return string.join(byteList, "")
return ''.join(byteList)
def _memoize(f):
class memodict(dict):
@ -332,7 +331,7 @@ def _readBitwiseImageData(bitmapObject, name, attrs, content, ttFont):
name, attr, content = element
if name == 'row':
mapParams = zip(attr['value'], itertools.repeat('1'))
rowData = string.join(itertools.starmap(binaryConv.get, mapParams), "")
rowData = ''.join(itertools.starmap(binaryConv.get, mapParams))
dataRows.append(_binary2data(rowData))
bitmapObject.setRows(dataRows, bitDepth=bitDepth, metrics=metrics, reverseBytes=True)
@ -532,7 +531,7 @@ class BitAlignedBitmapMixin:
dataList.append(chr(newByte))
# The way the data is kept is opposite the algorithm used.
data = string.join(dataList, "")
data = ''.join(dataList)
if not reverseBytes:
data = _reverseBytes(data)
return data
@ -711,7 +710,7 @@ class ebdt_bitmap_format_8(BitmapPlusSmallMetricsMixin, ComponentBitmapGlyph):
for curComponent in self.componentArray:
curComponent.glyphCode = ttFont.getGlyphID(curComponent.name)
dataList.append(sstruct.pack(ebdtComponentFormat, curComponent))
return string.join(dataList, "")
return ''.join(dataList)
class ebdt_bitmap_format_9(BitmapPlusBigMetricsMixin, ComponentBitmapGlyph):
@ -735,7 +734,7 @@ class ebdt_bitmap_format_9(BitmapPlusBigMetricsMixin, ComponentBitmapGlyph):
for curComponent in self.componentArray:
curComponent.glyphCode = ttFont.getGlyphID(curComponent.name)
dataList.append(sstruct.pack(ebdtComponentFormat, curComponent))
return string.join(dataList, "")
return ''.join(dataList)
# Dictionary of bitmap formats to the class representing that format

11
Lib/fontTools/ttLib/tables/E_B_L_C_.py
View File

@ -1,6 +1,5 @@
from . import DefaultTable
import string
import struct
from fontTools.misc import sstruct
import itertools
@ -197,7 +196,7 @@ class table_E_B_L_C_(DefaultTable.DefaultTable):
dataList.append(data)
dataList.extend(indexSubTablePairDataList)
return string.join(dataList, "")
return ''.join(dataList)
def toXML(self, writer, ttFont):
writer.simpletag('header', [('version', self.version)])
@ -477,7 +476,7 @@ def _createOffsetArrayIndexSubTableMixin(formatStringForDataType):
# Take care of any padding issues. Only occurs in format 3.
if offsetDataSize * len(dataList) % 4 != 0:
dataList.append(struct.pack(dataFormat, 0))
return string.join(dataList, "")
return ''.join(dataList)
return OffsetArrayIndexSubTableMixin
@ -534,7 +533,7 @@ class eblc_index_sub_table_2(FixedSizeIndexSubTableMixin, EblcIndexSubTable):
dataList = [EblcIndexSubTable.compile(self, ttFont)]
dataList.append(struct.pack(">L", self.imageSize))
dataList.append(sstruct.pack(bigGlyphMetricsFormat, self.metrics))
return string.join(dataList, "")
return ''.join(dataList)
class eblc_index_sub_table_3(_createOffsetArrayIndexSubTableMixin('H'), EblcIndexSubTable):
pass
@ -576,7 +575,7 @@ class eblc_index_sub_table_4(EblcIndexSubTable):
dataList.append(struct.pack(">L", len(glyphIds)))
tmp = [struct.pack(codeOffsetPairFormat, *cop) for cop in zip(idsPlusPad, offsets)]
dataList += tmp
data = string.join(dataList, "")
data = ''.join(dataList)
return data
class eblc_index_sub_table_5(FixedSizeIndexSubTableMixin, EblcIndexSubTable):
@ -604,7 +603,7 @@ class eblc_index_sub_table_5(FixedSizeIndexSubTableMixin, EblcIndexSubTable):
dataList += [struct.pack(">H", curId) for curId in glyphIds]
if len(glyphIds) % 2 == 1:
dataList.append(struct.pack(">H", 0))
return string.join(dataList, "")
return ''.join(dataList)
# Dictionary of indexFormat to the class representing that format.
eblc_sub_table_classes = {

1
Lib/fontTools/ttLib/tables/M_E_T_A_.py
View File

@ -2,7 +2,6 @@ from . import DefaultTable
import struct
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval
import string
import sys

1
Lib/fontTools/ttLib/tables/S_I_N_G_.py
View File

@ -2,7 +2,6 @@ from . import DefaultTable
from fontTools.misc import sstruct
import struct
import time
import string
from fontTools.misc.textTools import safeEval, num2binary, binary2num
SINGFormat = """

1
Lib/fontTools/ttLib/tables/S_V_G_.py
View File

@ -50,7 +50,6 @@ try:
import xml.etree.cElementTree as ET
except ImportError:
import xml.etree.ElementTree as ET
import string
import re
XML = ET.XML

9
Lib/fontTools/ttLib/tables/T_S_I__1.py
View File

@ -1,5 +1,4 @@
from . import DefaultTable
import string
class table_T_S_I__1(DefaultTable.DefaultTable):
@ -85,7 +84,7 @@ class table_T_S_I__1(DefaultTable.DefaultTable):
continue
writer.begintag("glyphProgram", name=name)
writer.newline()
writer.write_noindent(string.replace(text, "\r", "\n"))
writer.write_noindent(text.replace("\r", "\n"))
writer.newline()
writer.endtag("glyphProgram")
writer.newline()
@ -98,7 +97,7 @@ class table_T_S_I__1(DefaultTable.DefaultTable):
continue
writer.begintag("extraProgram", name=name)
writer.newline()
writer.write_noindent(string.replace(text, "\r", "\n"))
writer.write_noindent(text.replace("\r", "\n"))
writer.newline()
writer.endtag("extraProgram")
writer.newline()
@ -108,8 +107,8 @@ class table_T_S_I__1(DefaultTable.DefaultTable):
if not hasattr(self, "glyphPrograms"):
self.glyphPrograms = {}
self.extraPrograms = {}
lines = string.split(string.replace(string.join(content, ""), "\r", "\n"), "\n")
text = string.join(lines[1:-1], "\r")
lines = ''.join(content).replace("\r", "\n").split("\n")
text = '\r'.join(lines[1:-1])
if name == "glyphProgram":
self.glyphPrograms[attrs["name"]] = text
elif name == "extraProgram":

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

@ -57,7 +57,6 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
def compile(self, ttFont):
if not hasattr(self, "glyphOrder"):
self.glyphOrder = ttFont.getGlyphOrder()
import string
locations = []
currentLocation = 0
dataList = []
@ -69,7 +68,7 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
currentLocation = currentLocation + len(glyphData)
dataList.append(glyphData)
locations.append(currentLocation)
data = string.join(dataList, "")
data = ''.join(dataList)
if 'loca' in ttFont:
ttFont['loca'].set(locations)
ttFont['maxp'].numGlyphs = len(self.glyphs)

9
Lib/fontTools/ttLib/tables/_h_d_m_x.py
View File

@ -1,6 +1,5 @@
from . import DefaultTable
from fontTools.misc import sstruct
import string
hdmxHeaderFormat = """
> # big endian!
@ -75,15 +74,15 @@ class table__h_d_m_x(DefaultTable.DefaultTable):
def fromXML(self, name, attrs, content, ttFont):
if name != "hdmxData":
return
content = string.join(content, "")
lines = string.split(content, ";")
topRow = string.split(lines[0])
content = ''.join(content)
lines = content.split(";")
topRow = lines[0].split()
assert topRow[0] == "ppem:", "illegal hdmx format"
ppems = list(map(int, topRow[1:]))
self.hdmx = hdmx = {}
for ppem in ppems:
hdmx[ppem] = {}
lines = map(string.split, lines[1:])
lines = (line.split() for line in lines[1:])
for line in lines:
if not line:
continue

7
Lib/fontTools/ttLib/tables/_h_e_a_d.py
View File

@ -1,7 +1,6 @@
from . import DefaultTable
from fontTools.misc import sstruct
import time
import string
from fontTools.misc.textTools import safeEval, num2binary, binary2num
@ -119,13 +118,13 @@ _months = [' ', 'jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug',
_weekdays = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
def parse_date(datestring):
datestring = string.lower(datestring)
weekday, month, day, tim, year = string.split(datestring)
datestring = datestring.lower()
weekday, month, day, tim, year = datestring.split()
weekday = _weekdays.index(weekday)
month = _months.index(month)
year = int(year)
day = int(day)
hour, minute, second = [int(item) for item in string.split(tim, ":")]
hour, minute, second = [int(item) for item in tim.split(":")]
t = (year, month, day, hour, minute, second, weekday, 0, 0)
return int(time.mktime(t) - time.timezone)

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

@ -2,7 +2,6 @@ from . import DefaultTable
import struct
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval
import string
nameRecordFormat = """
> # big endian
@ -129,7 +128,7 @@ class NameRecord:
s = s.strip()
self.string = s.encode("utf_16_be")
else:
s = string.strip(string.join(content, ""))
s = ''.join(content).strip()
self.string = unicode(s, "utf8").encode("latin1")
def __cmp__(self, other):

11
Lib/fontTools/ttLib/tables/asciiTable.py
View File

@ -1,4 +1,3 @@
import string
from . import DefaultTable
@ -7,16 +6,16 @@ class asciiTable(DefaultTable.DefaultTable):
def toXML(self, writer, ttFont):
data = self.data
# removing null bytes. XXX needed??
data = string.split(data, '\0')
data = string.join(data, '')
data = data.split('\0')
data = ''.join(data)
writer.begintag("source")
writer.newline()
writer.write_noindent(string.replace(data, "\r", "\n"))
writer.write_noindent(data.replace("\r", "\n"))
writer.newline()
writer.endtag("source")
writer.newline()
def fromXML(self, name, attrs, content, ttFont):
lines = string.split(string.replace(string.join(content, ""), "\r", "\n"), "\n")
self.data = string.join(lines[1:-1], "\r")
lines = ''.join(content).replace("\r", "\n").split("\n")
self.data = "\r".join(lines[1:-1])

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

@ -1,7 +1,7 @@
"""ttLib.tables.ttProgram.py -- Assembler/disassembler for TrueType bytecode programs."""
import array
import re, string
import re
from fontTools.misc.textTools import num2binary, binary2num, readHex
# first, the list of instructions that eat bytes or words from the instruction stream
@ -242,11 +242,11 @@ class Program:
j = 0
for j in range(nValues):
if j and not (j % 25):
writer.write(string.join(line, " "))
writer.write(' '.join(line))
writer.newline()
line = []
line.append(assembly[i+j])
writer.write(string.join(line, " "))
writer.write(' '.join(line))
writer.newline()
i = i + j + 1
writer.endtag("assembly")
@ -258,7 +258,7 @@ class Program:
def fromXML(self, name, attrs, content, ttFont):
if name == "assembly":
self.fromAssembly(string.join(content, ""))
self.fromAssembly(''.join(content))
self._assemble()
del self.assembly
else:
@ -266,11 +266,11 @@ class Program:
self.fromBytecode(readHex(content))
def _assemble(self,
skipWhite=_skipWhite, mnemonicDict=mnemonicDict, strip=string.strip,
skipWhite=_skipWhite, mnemonicDict=mnemonicDict,
binary2num=binary2num):
assembly = self.assembly
if isinstance(assembly, type([])):
assembly = string.join(assembly, " ")
assembly = ' '.join(assembly)
bytecode = []
push = bytecode.append
lenAssembly = len(assembly)
@ -284,7 +284,7 @@ class Program:
if comment:
continue
arg = strip(arg)
arg = arg.strip()
if mnemonic.startswith("INSTR"):
# Unknown instruction
op = int(mnemonic[5:])

3
Lib/fontTools/ttx.py
View File

@ -170,7 +170,6 @@ class Options:
def ttList(input, output, options):
import string
ttf = TTFont(input, fontNumber=options.fontNumber, lazy=True)
reader = ttf.reader
tags = sorted(reader.keys())
@ -183,7 +182,7 @@ def ttList(input, output, options):
checkSum = int(entry.checkSum)
if checkSum < 0:
checkSum = checkSum + 0x100000000
checksum = "0x" + string.zfill(hex(checkSum)[2:-1], 8)
checksum = "0x%08X" % checkSum
print(format % (tag, checksum, entry.length, entry.offset))
print()
ttf.close()