From 528614e6e254dfe3c501ff440c291c6c55de5e6f Mon Sep 17 00:00:00 2001 From: Just Date: Sun, 16 Jan 2000 22:14:02 +0000 Subject: [PATCH] Moved psCharStrings.py, psLib.py and psOperators.py to fontTools.misc, since they're not "toplevel" font tools. git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@59 4cde692c-a291-49d1-8350-778aa11640f8 --- Lib/fontTools/cffLib.py | 4 ++-- Lib/fontTools/{ => misc}/psCharStrings.py | 0 Lib/fontTools/{ => misc}/psLib.py | 0 Lib/fontTools/{ => misc}/psOperators.py | 0 Lib/fontTools/t1Lib.py | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename Lib/fontTools/{ => misc}/psCharStrings.py (100%) rename Lib/fontTools/{ => misc}/psLib.py (100%) rename Lib/fontTools/{ => misc}/psOperators.py (100%) diff --git a/Lib/fontTools/cffLib.py b/Lib/fontTools/cffLib.py index f6c122e29..467777cc0 100644 --- a/Lib/fontTools/cffLib.py +++ b/Lib/fontTools/cffLib.py @@ -1,13 +1,13 @@ """cffLib.py -- read/write tools for Adobe CFF fonts.""" # -# $Id: cffLib.py,v 1.3 1999-12-20 22:02:10 Just Exp $" +# $Id: cffLib.py,v 1.4 2000-01-16 22:14:02 Just Exp $" # import struct, sstruct import string import types -import psCharStrings +from fontTools.misc import psCharStrings cffHeaderFormat = """ diff --git a/Lib/fontTools/psCharStrings.py b/Lib/fontTools/misc/psCharStrings.py similarity index 100% rename from Lib/fontTools/psCharStrings.py rename to Lib/fontTools/misc/psCharStrings.py diff --git a/Lib/fontTools/psLib.py b/Lib/fontTools/misc/psLib.py similarity index 100% rename from Lib/fontTools/psLib.py rename to Lib/fontTools/misc/psLib.py diff --git a/Lib/fontTools/psOperators.py b/Lib/fontTools/misc/psOperators.py similarity index 100% rename from Lib/fontTools/psOperators.py rename to Lib/fontTools/misc/psOperators.py diff --git a/Lib/fontTools/t1Lib.py b/Lib/fontTools/t1Lib.py index c4a22612e..d361c5c6d 100644 --- a/Lib/fontTools/t1Lib.py +++ b/Lib/fontTools/t1Lib.py @@ -61,8 +61,8 @@ class T1Font: return self.font[key] def parse(self): - import psLib - import psCharStrings + from fontTools.misc import psLib + from fontTools.misc import psCharStrings self.font = psLib.suckfont(self.data) charStrings = self.font["CharStrings"] lenIV = self.font["Private"].get("lenIV", 4)