Small latex mods: Escapes, Headings, Equations

* remove console escapes
* use different heading levels
* allow explicit definition of latex environments

nbconvert/exporters/exporter.py

@@ -66,6 +66,7 b' default_filters = {'
         'rm_ansi': nbconvert.filters.ansi.remove_ansi,
         'rm_dollars': nbconvert.filters.strings.strip_dollars,
         'rm_fake': nbconvert.filters.strings.rm_fake,
+        'rm_consoleesc': nbconvert.filters.strings.rm_consoleesc,
         'rm_math_space': nbconvert.filters.latex.rm_math_space,
         'wrap': nbconvert.filters.strings.wrap
 }

nbconvert/filters/latex.py

@@ -21,6 +21,7 b' import re'
 
 #Latex substitutions for escaping latex.
 LATEX_SUBS = (
+    (re.compile('\033\[[0-9;]+m'),''),  # handle console escapes
     (re.compile(r'\\'), r'\\textbackslash'),
     (re.compile(r'([{}_#%&$])'), r'\\\1'),
     (re.compile(r'~'), r'\~{}'),

nbconvert/filters/strings.py

@@ -14,6 +14,7 b' templates.'
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
+import re
 
 # Our own imports
 import textwrap
@@ -54,6 +55,18 b' def strip_dollars(text):'
     return text.strip('$')
 
 
+def rm_consoleesc(text):
+    """
+    Remove console escapes from text
+    
+    Parameters
+    ----------
+    text : str
+        Text to remove '/files/' from
+    """
+    r= re.compile("\033\[[0-9;]+m")
+    return r.sub('', text)
+
 def rm_fake(text):
     """
     Remove all occurrences of '/files/' from text

nbconvert/templates/latex/base.tplx

@@ -71,22 +71,38 b' it introduces a new line'
 ((* endblock *))
 
 ((* block data_latex -*))
-\begin{equation*}
-((( output.latex | rm_dollars)))
-\end{equation*}
+((*- if output.latex.startswith('$'): -*)) \begin{equation*}
+    ((( output.latex | rm_dollars)))
+    \end{equation*}
+((*- else -*)) ((( output.latex ))) ((*- endif *))
 ((* endblock *))
 
 ((* block stream *))
 \begin{verbatim}
-((( output.text)))
+((( output.text | rm_consoleesc)))
 \end{verbatim}
 ((* endblock stream *))
 
 ((* block markdowncell scoped *))((( cell.source | markdown2latex )))
 ((* endblock markdowncell *))
 
-((* block headingcell scoped *))
-\section{((( cell.source | markdown2latex)))}
+((* block headingcell scoped -*))
+    \
+    ((*- if cell.level == 1 -*))
+        ((* block h1 -*))section((* endblock h1 -*))
+    ((*- elif cell.level == 2 -*))
+        ((* block h2 -*))subsection((* endblock h2 -*))
+    ((*- elif cell.level == 3 -*))
+        ((* block h3 -*))subsubsection((* endblock h3 -*))
+    ((*- elif cell.level == 4 -*))
+        ((* block h4 -*))paragraph((* endblock h4 -*))
+    ((*- elif cell.level == 5 -*))
+        ((* block h5 -*))subparagraph((* endblock h5 -*))
+    ((*- elif cell.level == 6 -*))
+        ((* block h6 -*))subparagraph((* endblock h6 -*))
+        ((= 6th level not available in standard latex =))
+
+    ((*- endif -*)){((( cell.source | markdown2latex )))}
 ((* endblock headingcell *))
 
 ((* block rawcell scoped *))