Merge pull request #5948 from joergdietrich/patch-1

Enclose \ldots with {}

IPython/nbconvert/filters/latex.py

@@ -1,63 +1,63 b''
 """Latex filters.
 
 Module of useful filters for processing Latex within Jinja latex templates.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 import re
 
 #-----------------------------------------------------------------------------
 # Globals and constants
 #-----------------------------------------------------------------------------
 
 LATEX_RE_SUBS = (
-    (re.compile(r'\.\.\.+'), r'\\ldots'),
+    (re.compile(r'\.\.\.+'), r'{\\ldots}'),
 )
 
 # Latex substitutions for escaping latex.
 # see: http://stackoverflow.com/questions/16259923/how-can-i-escape-latex-special-characters-inside-django-templates
 
 LATEX_SUBS = {
     '&':  r'\&',
     '%':  r'\%',
     '$':  r'\$',
     '#':  r'\#',
     '_':  r'\_',
     '{':  r'\{',
     '}':  r'\}',
     '~':  r'\textasciitilde{}',
     '^':  r'\^{}',
     '\\': r'\textbackslash{}',
 }
 
 
 #-----------------------------------------------------------------------------
 # Functions
 #-----------------------------------------------------------------------------
 
 __all__ = ['escape_latex']
 
 def escape_latex(text):
     """
     Escape characters that may conflict with latex.
 
     Parameters
     ----------
     text : str
         Text containing characters that may conflict with Latex
     """
     text = ''.join(LATEX_SUBS.get(c, c) for c in text)
     for pattern, replacement in LATEX_RE_SUBS:
         text = pattern.sub(replacement, text)
 
     return text
     

IPython/nbconvert/filters/tests/test_latex.py

@@ -1,43 +1,43 b''
 """
 Module with tests for Latex
 """
 
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 from ...tests.base import TestsBase
 from ..latex import escape_latex
 
 
 #-----------------------------------------------------------------------------
 # Class
 #-----------------------------------------------------------------------------
 
 class TestLatex(TestsBase):
 
 
     def test_escape_latex(self):
         """escape_latex test"""
         tests = [
             (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'\ldots'),
+            ('...', r'{\ldots}'),
             ('','')]
 
         for test in tests:
             self._try_escape_latex(test[0], test[1])
 
 
     def _try_escape_latex(self, test, result):
         """Try to remove latex from string"""
         self.assertEqual(escape_latex(test), result)