Merge pull request #1077 from t-makaro/fix_latex_ansi

fix ansi2latex filtering
jupyter · Aug 1, 2019 · ed505f4 · ed505f4
2 parents 8e3cfb4 + 5797e3c
commit ed505f4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/nbconvert/exporters/templateexporter.py b/nbconvert/exporters/templateexporter.py
@@ -58,6 +58,7 @@
         'get_metadata': filters.get_metadata,
         'convert_pandoc': filters.convert_pandoc,
         'json_dumps': json.dumps,
+        'strip_trailing_newline': filters.strip_trailing_newline,
 }
 
 class ExtensionTolerantLoader(BaseLoader):

diff --git a/nbconvert/filters/strings.py b/nbconvert/filters/strings.py
@@ -39,6 +39,7 @@
     'add_prompts',
     'ascii_only',
     'prevent_list_blocks',
+    'strip_trailing_newline',
 ]
 
 
@@ -241,3 +242,11 @@ def prevent_list_blocks(s):
     out = re.sub('(^\s*)\+', '\\1\+', out)
     out = re.sub('(^\s*)\*', '\\1\*', out)
     return out
+
+def strip_trailing_newline(text):
+    """
+    Strips a newline from the end of text.
+    """
+    if text.endswith('\n'):
+        text = text[:-1]
+    return text
diff --git a/nbconvert/templates/latex/style_jupyter.tplx b/nbconvert/templates/latex/style_jupyter.tplx
@@ -139,7 +139,7 @@
 
 ((* block stream *))
     \begin{Verbatim}[commandchars=\\\{\}]
-((( output.text | wrap_text(charlim) | escape_latex | ansi2latex -)))
+((( output.text | wrap_text(charlim) | escape_latex | strip_trailing_newline | ansi2latex )))
     \end{Verbatim}
 ((* endblock stream *))