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

Changes to use the new fontTools.misc.eexec module instead of the old eexec module.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@57 4cde692c-a291-49d1-8350-778aa11640f8
This commit is contained in:
Just 2000-01-12 19:15:57 +00:00
parent 6c53f88cf3
commit c2be3d982b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/fontTools/psLib.py
View File

@ -1,7 +1,7 @@
import StringIO import StringIO
import regex import regex
import string import string
import eexec from fontTools.misc import eexec
import types import types
from psOperators import * from psOperators import *
@ -99,7 +99,7 @@ class PSTokenizer(StringIO.StringIO):
self.pos = self.pos + 1 self.pos = self.pos + 1
#self.skipwhite() #self.skipwhite()
self.dirtybuf = self.buf[self.pos:] self.dirtybuf = self.buf[self.pos:]
self.buf, R = eexec.Decrypt(self.dirtybuf, 55665) self.buf, R = eexec.decrypt(self.dirtybuf, 55665)
self.len = len(self.buf) self.len = len(self.buf)
self.pos = 4 self.pos = 4

12
Lib/fontTools/t1Lib.py
View File

@ -20,7 +20,7 @@ __author__ = "jvr"
__version__ = "1.0b2" __version__ = "1.0b2"
DEBUG = 0 DEBUG = 0
import eexec from fontTools.misc import eexec
import string import string
import re import re
import os import os
@ -68,11 +68,11 @@ class T1Font:
lenIV = self.font["Private"].get("lenIV", 4) lenIV = self.font["Private"].get("lenIV", 4)
assert lenIV >= 0 assert lenIV >= 0
for glyphName, charString in charStrings.items(): for glyphName, charString in charStrings.items():
charString, R = eexec.Decrypt(charString, 4330) charString, R = eexec.decrypt(charString, 4330)
charStrings[glyphName] = psCharStrings.T1CharString(charString[lenIV:]) charStrings[glyphName] = psCharStrings.T1CharString(charString[lenIV:])
subrs = self.font["Private"]["Subrs"] subrs = self.font["Private"]["Subrs"]
for i in range(len(subrs)): for i in range(len(subrs)):
charString, R = eexec.Decrypt(subrs[i], 4330) charString, R = eexec.decrypt(subrs[i], 4330)
subrs[i] = psCharStrings.T1CharString(charString[lenIV:]) subrs[i] = psCharStrings.T1CharString(charString[lenIV:])
del self.data del self.data
@ -246,7 +246,7 @@ def writeother(path, data, dohex = 0):
code = 1 code = 1
if code == 2 and dohex: if code == 2 and dohex:
while chunk: while chunk:
f.write(eexec.hexstring(chunk[:hexlinelen])) f.write(eexec.hexString(chunk[:hexlinelen]))
f.write('\r') f.write('\r')
chunk = chunk[hexlinelen:] chunk = chunk[hexlinelen:]
else: else:
@ -279,7 +279,7 @@ def decrypttype1(data):
if isencrypted: if isencrypted:
if ishex(chunk[:4]): if ishex(chunk[:4]):
chunk = dehexstring(chunk) chunk = dehexstring(chunk)
decrypted, R = eexec.Decrypt(chunk, 55665) decrypted, R = eexec.decrypt(chunk, 55665)
decrypted = decrypted[4:] decrypted = decrypted[4:]
if decrypted[-len(EEXECINTERNALEND)-1:-1] <> EEXECINTERNALEND \ if decrypted[-len(EEXECINTERNALEND)-1:-1] <> EEXECINTERNALEND \
and decrypted[-len(EEXECINTERNALEND)-2:-2] <> EEXECINTERNALEND: and decrypted[-len(EEXECINTERNALEND)-2:-2] <> EEXECINTERNALEND:
@ -309,7 +309,7 @@ def findencryptedchunks(data):
return chunks return chunks
def dehexstring(hexstring): def dehexstring(hexstring):
return eexec.dehexstring(string.join(string.split(hexstring), "")) return eexec.deHexString(string.join(string.split(hexstring), ""))
# Type 1 assertion # Type 1 assertion