move latex preamble verbose.report from texmanager into

ddale · ddale · commit 1c034497f788 · 2007-05-17T15:52:54.000Z
rc validation routines

svn path=/trunk/matplotlib/; revision=3278
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -545,6 +545,20 @@ def validate_comma_sep_str(s):
     except ValueError:
         raise ValueError('Could not convert all entries to strings')
 
+def validate_latex_preamble(s):
+    'return a list'
+    preamble_list = validate_comma_sep_str(s)
+    if not preamble_list == ['']: 
+        verbose.report("""
+*****************************************************************
+You have the following UNSUPPORTED LaTeX preamble customizations:
+%s
+Please do not ask for support with these customizations active.
+*****************************************************************
+"""% '\n'.join(preamble_list), 'helpful')
+    return preamble_list
+    
+
 class ValidateInStrings:
     def __init__(self, valid, ignorecase=False):
         'valid is a list of legal strings'
@@ -761,7 +775,7 @@ def __call__(self, s):
     # text props
     'text.color'        : ['k', validate_color],     # black
     'text.usetex'       : [False, validate_usetex],
-    'text.latex.preamble': ['', validate_comma_sep_str],
+    'text.latex.preamble': ['', validate_latex_preamble],
     'text.dvipnghack'    : [False, validate_bool],
     'text.fontstyle'    : ['normal', str],
     'text.fontangle'    : ['normal', str],
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -174,15 +174,6 @@ def get_font_preamble(self):
         return self._font_preamble
     
     def get_custom_preamble(self):
-        custom_preamble = '\n'.join(rcParams['text.latex.preamble'])
-        if custom_preamble is not '':
-            verbose.report("""
-***************************************************************************
-You have the following UNSUPPORTED LaTeX preamble customizations:
-%s
-Please do not ask for support with these customizations active.
-***************************************************************************
-"""%custom_preamble, 'helpful')
         return '\n'.join(rcParams['text.latex.preamble'])
         
     def get_shell_cmd(self, *args):
