moved foundry to lib

samizdatco · samizdatco · commit c19d77a63e61 · 2014-11-04T01:38:18.000-05:00
diff --git a/plotdevice/context.py b/plotdevice/context.py
@@ -5,9 +5,9 @@
 from os.path import exists, expanduser
 
 from .lib.cocoa import *
-from .util.foundry import typespec, fontspec
-from .util import _copy_attr, _copy_attrs, _flatten, trim_zeroes, numlike
+from .lib.foundry import typespec
 from .lib import pathmatics
+from .util import _copy_attr, _copy_attrs, _flatten, trim_zeroes, numlike
 from .gfx.transform import Dimension, parse_coords
 from .gfx import *
 from . import gfx, lib, util, Halted, DeviceError
diff --git a/plotdevice/gfx/atoms.py b/plotdevice/gfx/atoms.py
@@ -5,7 +5,7 @@
 from collections import namedtuple, defaultdict
 
 from plotdevice import DeviceError
-from ..util.foundry import fontspec, typespec
+from ..lib.foundry import fontspec, typespec
 from ..util import _copy_attrs, _copy_attr, _flatten, trim_zeroes, numlike
 from .colors import Color
 from .transform import Transform, Dimension, Region
diff --git a/plotdevice/gfx/typography.py b/plotdevice/gfx/typography.py
@@ -11,8 +11,8 @@
 from .transform import Transform, Region, Size, Point
 from .colors import Color
 from .bezier import Bezier
-from ..util.foundry import *
 from ..util import _copy_attrs, numlike, XMLParser, read
+from ..lib.foundry import *
 from ..lib import pathmatics
 
 _ctx = None
diff --git a/plotdevice/lib/__init__.py b/plotdevice/lib/__init__.py
@@ -14,7 +14,7 @@
 
 # test the sys.path by attempting to load the c-extensions
 try:
-    import io, pathmatics
+    import io, pathmatics, foundry
 except ImportError:
     from pprint import pformat
     notfound = "Couldn't locate C extensions (cIO.so, & cPathmatics.so).\nSearched in:\n%s\nto no avail..."%pformat(sys.path)
diff --git a/plotdevice/lib/foundry.py b/plotdevice/lib/foundry.py
@@ -5,8 +5,8 @@
 from pprint import pprint, pformat
 from operator import itemgetter, attrgetter
 from collections import namedtuple, Counter, OrderedDict as odict, defaultdict as ddict
-from ..lib.cocoa import *
-from . import numlike
+from .cocoa import *
+from ..util import numlike
 
 from plotdevice import DeviceError
 
@@ -309,7 +309,7 @@ def fontspec(*args, **kwargs):
                 print 'Font: unrecognized weight or family name "%s"'%item
         elif numlike(item) and 'size' not in kwargs:
             spec['size'] = item
-    
+
     # incorporate any typesetting features
     spec.update(aat_features(kwargs))
 
@@ -338,11 +338,11 @@ def typespec(**kwargs):
 
 aat_consts = {
     "Ligatures":1, # kLigaturesType
-    "CommonOn":2, "CommonOff":3, "RareOn":4, "RareOff":5, 
-    
+    "CommonOn":2, "CommonOff":3, "RareOn":4, "RareOff":5,
+
     "LowerCase":37, # kLowerCaseType
     "UpperCase":38, # kUpperCaseType
-    "DefaultCase":0, "SmallCaps":1, 
+    "DefaultCase":0, "SmallCaps":1,
 
     "NumberCase":21, # kNumberCaseType
     "LowerCaseNumbers":0, "UpperCaseNumbers":1,
@@ -400,8 +400,8 @@ def typespec(**kwargs):
                    NSFontFeatureTypeIdentifierKey as feature_id, \
                    NSFontFeatureSelectorIdentifierKey as selector_id
 
-# convert the semi-sensibly named items in pd_features's arrays into their SFNTLayoutTypes.h 
-# const values. the _aat_features dict uses the same keys as pd_features but the contents of 
+# convert the semi-sensibly named items in pd_features's arrays into their SFNTLayoutTypes.h
+# const values. the _aat_features dict uses the same keys as pd_features but the contents of
 # the 'command' tuples become ints
 _aat_features = {}
 # build feature dicts for the numbered `stylistic sets' construction
