Escape latex fixes

Added ... to \ldots escape
Escape ansi like before

IPython/nbconvert/filters/latex.py

@@ -13,7 +13,8 b' Module of useful filters for processing Latex within Jinja latex templates.'
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
-import re
+
+from ansi import strip_ansi
 
 #-----------------------------------------------------------------------------
 # Globals and constants
@@ -26,12 +27,14 b' LATEX_SUBS = {'
     '%':  r'\%', 
     '$':  r'\$', 
     '#':  r'\#', 
-    '_':  r'\letterunderscore{}', 
-    '{':  r'\letteropenbrace{}', 
-    '}':  r'\letterclosebrace{}',
-    '~':  r'\lettertilde{}', 
-    '^':  r'\letterhat{}', 
-    '\\': r'\letterbackslash{}'}
+    '_':  r'\_', 
+    '{':  r'\{', 
+    '}':  r'\}',
+    '~':  r'\textasciitilde{}', 
+    '^':  r'\^{}', 
+    '\\': r'\textbackslash{}',
+    '...': r'\ldots{}',
+}
 
 
 #-----------------------------------------------------------------------------
@@ -43,7 +46,7 b" __all__ = ['escape_latex',"
 
 def escape_latex(text):
     """
-    Escape characters that may conflict with latex.
+    Remove ansi codes and escape characters that may conflict with latex.
 
     Parameters
     ----------
@@ -51,7 +54,14 b' def escape_latex(text):'
         Text containing characters that may conflict with Latex
     """
 
-    return ''.join([LATEX_SUBS.get(c, c) for c in text])
+    # Remove the ansi coloring from the text and then escape it.  Escape single
+    # characters first and then multiple characters.
+    text = strip_ansi(text)
+    text = ''.join([LATEX_SUBS.get(c, c) for c in text])
+    for search, replace in LATEX_SUBS.items():
+        if len(search) > 1:
+            text = text.replace(search,replace)
+    return text
     
     
 def strip_math_space(text):

IPython/nbconvert/filters/tests/test_latex.py

@@ -28,9 +28,10 b' class TestLatex(TestsBase):'
     def test_escape_latex(self):
         """escape_latex test"""
         tests = [
-            (r'How are \you doing today?', r'How are \letterbackslash{}you doing today?'),
-            (r'\escapechar=`\A\catcode`\|=0 |string|foo', r'\letterbackslash{}escapechar=`\letterbackslash{}A\letterbackslash{}catcode`\letterbackslash{}|=0 |string|foo'),
-            (r'# $ % & ~ _ ^ \ { }', r'\# \$ \% \& \lettertilde{} \letterunderscore{} \letterhat{} \letterbackslash{} \letteropenbrace{} \letterclosebrace{}'),
+            (r'How are \you doing today?', r'How are \textbackslash{}you doing today?'),
+            (r'\escapechar=`\A\catcode`\|=0 |string|foo', r'\textbackslash{}escapechar=`\textbackslash{}A\textbackslash{}catcode`\textbackslash{}|=0 |string|foo'),
+            (r'# $ % & ~ _ ^ \ { }', r'\# \$ \% \& \textasciitilde{} \_ \^{} \textbackslash{} \{ \}'),
+            (r"This SHOULD work...  If not, I'm wrong.", "This SHOULD work\ldots{}  If not, I'm wrong."),
             ('','')]
 
         for test in tests: