--- a/decoupage/formatters.py	Wed Nov 03 18:17:30 2010 -0700
+++ b/decoupage/formatters.py	Wed Nov 03 18:41:42 2010 -0700
@@ -128,6 +128,8 @@
     """
     # TODO : deal with CamelCaseFilenames
 
+    separators = ['_', '-'] # space substitute separators
+
     def __call__(self, request, data):
         for f in data['files']:
             if f['description'] is None:
@@ -135,8 +137,10 @@
                 if '.' in description:
                     description = description.rsplit('.', 1)[0]
                 decription = description.strip('_')
-                if '_' in description:
-                    description = ' '.join([i.title() for i in description.split('_')])
+                for separator in self.separators:
+                    if separator in description:
+                        description = ' '.join([i.title() for i in description.split(separator)])
+                        
                 f['description'] = description