`strip_files_prefix` now also strips markdown style links, `latex_base` updated to include filter

IPython/nbconvert/exporters/templateexporter.py

@@ -61,7 +61,6 b' default_filters = {'
         'citation2latex': filters.citation2latex,
         'path2url': filters.path2url,
         'add_prompts': filters.add_prompts,
-        'strip_url_static_file_prefix': filters.strip_url_static_file_prefix,
 }
 
 #-----------------------------------------------------------------------------

IPython/nbconvert/filters/latex.py

@@ -19,8 +19,6 b' import re'
 # Globals and constants
 #-----------------------------------------------------------------------------
 
-MARKDOWN_IMAGE_RE = re.compile(r'!\[(?P<caption>.*?)\]\(/?files/(?P<location>.*?)\)')
-
 LATEX_RE_SUBS = (
     (re.compile(r'\.\.\.+'), r'\\ldots'),
 )
@@ -46,8 +44,7 b' LATEX_SUBS = {'
 # Functions
 #-----------------------------------------------------------------------------
 
-__all__ = ['escape_latex', 
-           'strip_url_static_file_prefix']
+__all__ = ['escape_latex']
 
 def escape_latex(text):
     """
@@ -63,10 +60,4 b' def escape_latex(text):'
         text = pattern.sub(replacement, text)
 
     return text
-
-
-def strip_url_static_file_prefix(text):
-    text = MARKDOWN_IMAGE_RE.sub(r'![\1](\2)', text)
-    return text
-
     

IPython/nbconvert/filters/strings.py

@@ -123,18 +123,21 b' def strip_dollars(text):'
 
 
 files_url_pattern = re.compile(r'(src|href)\=([\'"]?)files/')
+markdown_url_pattern = re.compile(r'!\[(?P<caption>.*?)\]\(/?files/(?P<location>.*?)\)')
 
 def strip_files_prefix(text):
     """
-    Fix all fake URLs that start with `files/`,
-    stripping out the `files/` prefix.
+    Fix all fake URLs that start with `files/`, stripping out the `files/` prefix.
+    Applies to both urls (for html) and relative paths (for markdown paths).
     
     Parameters
     ----------
     text : str
         Text in which to replace 'src="files/real...' with 'src="real...'
     """
-    return files_url_pattern.sub(r"\1=\2", text)
+    cleaned_text = files_url_pattern.sub(r"\1=\2", text)
+    cleaned_text = markdown_url_pattern.sub(r'![\1](\2)', cleaned_text)
+    return cleaned_text
 
 
 def comment_lines(text, prefix='# '):

IPython/nbconvert/filters/tests/test_latex.py

@@ -41,20 +41,3 b' class TestLatex(TestsBase):'
     def _try_escape_latex(self, test, result):
         """Try to remove latex from string"""
         self.assertEqual(escape_latex(test), result)
-
-    def test_strip_url_static_file_prefix(self):
-        tests = [
-            ('hello!', 'hello!'),
-            ('hello![caption]', 'hello![caption]'),
-            ('hello![caption](/url/location.gif)', 'hello![caption](/url/location.gif)'),
-            ('hello![caption](url/location.gif)', 'hello![caption](url/location.gif)'),
-            ('hello![caption](url/location.gif)', 'hello![caption](url/location.gif)'),
-            ('hello![caption](files/url/location.gif)', 'hello![caption](url/location.gif)'),
-            ('hello![caption](/files/url/location.gif)', 'hello![caption](url/location.gif)'),
-        ]
-        
-        for test in tests:
-            self._test_strip_url_static_file_prefix(test[0], test[1])
-
-    def _test_strip_url_static_file_prefix(self, test, result):
-        self.assertEqual(strip_url_static_file_prefix(test), result)

IPython/nbconvert/filters/tests/test_strings.py

@@ -87,7 +87,13 b' class TestStrings(TestsBase):'
             ('/files', '/files'), 
             ('test="/files"', 'test="/files"'), 
             ('My files are in `files/`', 'My files are in `files/`'),
-            ('<a href="files/test.html">files/test.html</a>', '<a href="test.html">files/test.html</a>')]
+            ('<a href="files/test.html">files/test.html</a>', '<a href="test.html">files/test.html</a>'),
+            ('hello![caption]', 'hello![caption]'),
+            ('hello![caption](/url/location.gif)', 'hello![caption](/url/location.gif)'),
+            ('hello![caption](url/location.gif)', 'hello![caption](url/location.gif)'),
+            ('hello![caption](url/location.gif)', 'hello![caption](url/location.gif)'),
+            ('hello![caption](files/url/location.gif)', 'hello![caption](url/location.gif)'),
+            ('hello![caption](/files/url/location.gif)', 'hello![caption](url/location.gif)'),]
         for test in tests:
             self._try_files_prefix(test[0], test[1])
 

IPython/nbconvert/templates/latex/latex_base.tplx

@@ -202,7 +202,7 b' This template does not define a docclass, the inheriting class must define this.'
     ((* elif cell.level == 6 -*))
         ((* block h6 -*))\\*\textit((* endblock h6 -*))
     ((*- endif -*))
-    {((( cell.source | replace('\n', ' ') | citation2latex | strip_url_static_file_prefix | markdown2latex )))}
+    {((( cell.source | replace('\n', ' ') | citation2latex | strip_files_prefix | markdown2latex )))}
 
 ((* endblock headingcell *))
 
@@ -215,7 +215,7 b' This template does not define a docclass, the inheriting class must define this.'
 
 % Render markdown
 ((* block markdowncell scoped *))
-    ((( cell.source | citation2latex | strip_url_static_file_prefix | markdown2latex )))
+    ((( cell.source | citation2latex | strip_files_prefix | markdown2latex )))
 ((* endblock markdowncell *))
 
 % Spit out the contents of raw cells unmodified