validation update

samizdatco · samizdatco · commit a26147c19a89 · 2014-12-08T23:04:28.000-05:00
diff --git a/plotdevice/gfx/atoms.py b/plotdevice/gfx/atoms.py
@@ -326,13 +326,10 @@ class StyleMixin(Grob):
     """Mixin class for text-styling support.
     Adds the stylesheet, fill, and font attributes to the class."""
     ctxAttrs = ('_font', '_stylesheet', '_fillcolor')
-    opts = ('face','family','size','weight','width','variant','italic', # font selection
-            'lig','sc','osf','tab','vpos','frac', 'ss', # aat features
-            'leading', 'tracking', 'indent', 'align', 'hyphenate', # layout
-            'fontname','fontsize','lineheight','font', # nodebox compat
-            'style', # use named style as baseline
-            'fill', # color override
-            )
+    layoutOpts = ('leading','spacing','margin','indent','align','hyphenate','lineheight')
+    fontOpts = ('face','family','size','weight','width','variant','italic','tracking','fontname','fontsize','font')
+    aatOpts = ('lig','sc','osf','tab','vpos','frac', 'ss')
+    opts = fontOpts + layoutOpts + aatOpts + ('style', 'fill')
 
     def __init__(self, **kwargs):
         super(StyleMixin, self).__init__(**kwargs)
diff --git a/plotdevice/gfx/typography.py b/plotdevice/gfx/typography.py
@@ -228,6 +228,14 @@ def __exit__(self, type, value, tb):
         _ctx._layout, _ctx._font = self._rollback
         del self._rollback
 
+    @classmethod
+    def validate(cls, kwargs):
+        known = LineLayout._fields + ('lineheight',)
+        remaining = [arg for arg in kwargs.keys() if arg not in known]
+        if remaining:
+            unknown = "Unknown %s argument%s: %s" % (cls.__name__, '' if len(remaining)==1 else 's', ", ".join(remaining))
+            raise DeviceError(unknown)
+
 
 class Family(object):
     def __init__(self, famname):
