Merge pull request #4873 from minrk/ucs-combine

use 'combine' option to ucs package

IPython/nbconvert/templates/latex/base.tplx

@@ -20,7 +20,7 b' This template does not define a docclass, the inheriting class must define this.'
     \usepackage{geometry} % Used to adjust the document margins
     \usepackage{amsmath} % Equations
     \usepackage{amssymb} % Equations
-    \usepackage[mathletters]{ucs} % Extended unicode (utf-8) support
+    \usepackage[mathletters,combine]{ucs} % Extended unicode (utf-8) support
     \usepackage[utf8x]{inputenc} % Allow utf-8 characters in the tex document
     \usepackage{fancyvrb} % verbatim replacement that allows latex
     \usepackage{grffile} % extends the file name processing of package graphics 

IPython/nbconvert/tests/test_nbconvertapp.py

@@ -195,7 +195,7 b' class TestNbConvertApp(TestsBase):'
     
     @dec.onlyif_cmds_exist('pdflatex')
     @dec.onlyif_cmds_exist('pandoc')
-    def test_filename_spaces(self):
+    def test_filename_accent(self):
         """
         Generate PDFs if notebooks have an accent in their name?
         """