diff --git a/IPython/Magic.py b/IPython/Magic.py index 612731f..d6b1d6c 100644 --- a/IPython/Magic.py +++ b/IPython/Magic.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Magic functions for InteractiveShell. -$Id: Magic.py 1181 2006-03-01 11:27:24Z vivainio $""" +$Id: Magic.py 1188 2006-03-02 18:24:00Z vivainio $""" #***************************************************************************** # Copyright (C) 2001 Janko Hauser and @@ -251,7 +251,7 @@ license. To use profiling, please install"python2.3-profiler" from non-free.""") """Format a string for latex inclusion.""" # Characters that need to be escaped for latex: - escape_re = re.compile(r'(%|_|\$|#)',re.MULTILINE) + escape_re = re.compile(r'(%|_|\$|#|&)',re.MULTILINE) # Magic command names as headers: cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC, re.MULTILINE) diff --git a/eggsetup.py b/eggsetup.py index 6931cf2..5070bce 100755 --- a/eggsetup.py +++ b/eggsetup.py @@ -16,4 +16,5 @@ print sys.argv execfile('setup.py') # clean up the junk left around by setuptools -os.system('rm -rf ipython.egg-info build') +if "develop" not in sys.argv: + os.system('rm -rf ipython.egg-info build')