##// END OF EJS Templates
Fix code block rendering when lexer not known
Fix code block rendering when lexer not known

File last commit:

r17258:f239f6fd
r17258:f239f6fd
Show More
markdown.py
214 lines | 6.6 KiB | text/x-python | PythonLexer
Jonathan Frederic
Cleanup and refactor of filters
r10676 """Markdown filters
This file contains a collection of utility filters for dealing with
markdown within Jinja templates.
Jonathan Frederic
Transformer refactor
r10436 """
#-----------------------------------------------------------------------------
# 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 __future__ import print_function
# Stdlib imports
MinRK
add marked.js entry point for md2html in nbconvert...
r14206 import os
Jonathan Frederic
Transformer refactor
r10436 import subprocess
MinRK
prefer marked to pandoc for markdown2html...
r14203 from io import TextIOWrapper, BytesIO
Thomas Kluyver
Integrate pass-through of mathematical expressions with markdown rendering
r17251 import re
Jonathan Frederic
Transformer refactor
r10436
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249 import mistune
from pygments import highlight
from pygments.lexers import get_lexer_by_name
from pygments.formatters import HtmlFormatter
Thomas Kluyver
Fix code block rendering when lexer not known
r17258 from pygments.util import ClassNotFound
Thomas Kluyver
Add 'mistune' markdown parser as an option for markdown2html
r17247
MinRK
prefer marked to pandoc for markdown2html...
r14203 # IPython imports
MinRK
add markdown2html filter...
r11268 from IPython.nbconvert.utils.pandoc import pandoc
MinRK
prefer marked to pandoc for markdown2html...
r14203 from IPython.nbconvert.utils.exceptions import ConversionException
Jonathan Frederic
Cleanup
r15692 from IPython.utils.process import get_output_error_code
MinRK
prefer marked to pandoc for markdown2html...
r14203 from IPython.utils.py3compat import cast_bytes
Jonathan Frederic
Cleanup
r15692 from IPython.utils.version import check_version
MinRK
add markdown2html filter...
r11268
Jonathan Frederic
Transformer refactor
r10436 #-----------------------------------------------------------------------------
# Functions
#-----------------------------------------------------------------------------
MinRK
add marked.js entry point for md2html in nbconvert...
r14206 marked = os.path.join(os.path.dirname(__file__), "marked.js")
Jonathan Frederic
Only check for node on first call, not on import.
r15697 _node = None
Jonathan Frederic
Post code-review, extended refactor.
r10485
Brian E. Granger
Fixing import logic.
r11088 __all__ = [
MinRK
add markdown2html filter...
r11268 'markdown2html',
MinRK
prefer marked to pandoc for markdown2html...
r14203 'markdown2html_pandoc',
'markdown2html_marked',
Thomas Kluyver
Add 'mistune' markdown parser as an option for markdown2html
r17247 'markdown2html_mistune',
Brian E. Granger
Fixing import logic.
r11088 'markdown2latex',
MinRK
prefer marked to pandoc for markdown2html...
r14203 'markdown2rst',
Brian E. Granger
Fixing import logic.
r11088 ]
MinRK
add marked.js entry point for md2html in nbconvert...
r14206 class NodeJSMissing(ConversionException):
"""Exception raised when node.js is missing."""
MinRK
prefer marked to pandoc for markdown2html...
r14203 pass
Jonathan Frederic
Cleanup and refactor of filters
r10676 def markdown2latex(source):
Jonathan Frederic
Transformer refactor
r10436 """Convert a markdown string to LaTeX via pandoc.
This function will raise an error if pandoc is not installed.
Any error messages generated by pandoc are printed to stderr.
Parameters
----------
Jonathan Frederic
Cleanup and refactor of filters
r10676 source : string
Jonathan Frederic
Transformer refactor
r10436 Input string, assumed to be valid markdown.
Returns
-------
out : string
Output as returned by pandoc.
"""
MinRK
add markdown2html filter...
r11268 return pandoc(source, 'markdown', 'latex')
Jonathan Frederic
Transformer refactor
r10436
Thomas Kluyver
Integrate pass-through of mathematical expressions with markdown rendering
r17251 class MathBlockGrammar(mistune.BlockGrammar):
block_math = re.compile("^\$\$(.*?)\$\$")
Thomas Kluyver
Add support for \begin foo \end math blocks
r17254 block_math2 = re.compile(r"^\\begin(.*?)\\end")
Thomas Kluyver
Integrate pass-through of mathematical expressions with markdown rendering
r17251
class MathBlockLexer(mistune.BlockLexer):
Thomas Kluyver
Add support for \begin foo \end math blocks
r17254 default_features = ['block_math', 'block_math2'] + mistune.BlockLexer.default_features
Thomas Kluyver
Integrate pass-through of mathematical expressions with markdown rendering
r17251
def __init__(self, rules=None, **kwargs):
if rules is None:
rules = MathBlockGrammar()
super(MathBlockLexer, self).__init__(rules, **kwargs)
def parse_block_math(self, m):
"""Parse a $$math$$ block"""
self.tokens.append({
'type': 'block_math',
'text': m.group(1)
})
Thomas Kluyver
Add support for \begin foo \end math blocks
r17254 parse_block_math2 = parse_block_math
Thomas Kluyver
Integrate pass-through of mathematical expressions with markdown rendering
r17251 class MathInlineGrammar(mistune.InlineGrammar):
math = re.compile("^\$(.+?)\$")
class MathInlineLexer(mistune.InlineLexer):
default_features = ['math'] + mistune.InlineLexer.default_features
def __init__(self, renderer, rules=None, **kwargs):
if rules is None:
rules = MathInlineGrammar()
super(MathInlineLexer, self).__init__(renderer, rules, **kwargs)
def output_math(self, m):
self.renderer.inline_math(m.group(1))
class MarkdownWithMath(mistune.Markdown):
def __init__(self, renderer, **kwargs):
if 'inline' not in kwargs:
kwargs['inline'] = MathInlineLexer(renderer, **kwargs)
if 'block' not in kwargs:
kwargs['block'] = MathBlockLexer(**kwargs)
super(MarkdownWithMath, self).__init__(renderer, **kwargs)
def parse_block_math(self):
return self.renderer.block_math(self.token['text'])
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249
Thomas Kluyver
Rename mistune renderer class
r17256 class IPythonRenderer(mistune.Renderer):
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249 def block_code(self, code, lang):
Thomas Kluyver
Fix code block rendering when lexer not known
r17258 if lang:
try:
lexer = get_lexer_by_name(lang, stripall=True)
except ClassNotFound:
code = lang + '\n' + code
lang = None
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249 if not lang:
return '\n<pre><code>%s</code></pre>\n' % \
mistune.escape(code)
Thomas Kluyver
Fix code block rendering when lexer not known
r17258
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249 formatter = HtmlFormatter()
return highlight(code, lexer, formatter)
Thomas Kluyver
Add highlighting of GFM code blocks with mistune
r17248
Thomas Kluyver
Integrate pass-through of mathematical expressions with markdown rendering
r17251 # Pass math through unaltered - mathjax does the rendering in the browser
def block_math(self, text):
return '$$%s$$' % text
def inline_math(self, text):
return '$%s$' % text
Thomas Kluyver
Add 'mistune' markdown parser as an option for markdown2html
r17247 def markdown2html_mistune(source):
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249 """Convert a markdown string to HTML using mistune"""
Thomas Kluyver
Rename mistune renderer class
r17256 return MarkdownWithMath(renderer=IPythonRenderer()).render(source)
Thomas Kluyver
Add 'mistune' markdown parser as an option for markdown2html
r17247
MinRK
prefer marked to pandoc for markdown2html...
r14203 def markdown2html_pandoc(source):
MinRK
add markdown2html filter...
r11268 """Convert a markdown string to HTML via pandoc"""
MinRK
use mathjax-style for math passing through pandoc to html
r11294 return pandoc(source, 'markdown', 'html', extra_args=['--mathjax'])
MinRK
add markdown2html filter...
r11268
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249 def _find_nodejs():
global _node
if _node is None:
# prefer md2html via marked if node.js >= 0.9.12 is available
# node is called nodejs on debian, so try that first
_node = 'nodejs'
if not _verify_node(_node):
_node = 'node'
return _node
MinRK
prefer marked to pandoc for markdown2html...
r14203 def markdown2html_marked(source, encoding='utf-8'):
"""Convert a markdown string to HTML via marked"""
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249 command = [_find_nodejs(), marked]
MinRK
prefer marked to pandoc for markdown2html...
r14203 try:
p = subprocess.Popen(command,
stdin=subprocess.PIPE, stdout=subprocess.PIPE
)
except OSError as e:
MinRK
add marked.js entry point for md2html in nbconvert...
r14206 raise NodeJSMissing(
MinRK
prefer marked to pandoc for markdown2html...
r14203 "The command '%s' returned an error: %s.\n" % (" ".join(command), e) +
MinRK
add marked.js entry point for md2html in nbconvert...
r14206 "Please check that Node.js is installed."
MinRK
prefer marked to pandoc for markdown2html...
r14203 )
out, _ = p.communicate(cast_bytes(source, encoding))
out = TextIOWrapper(BytesIO(out), encoding, 'replace').read()
return out.rstrip('\n')
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249 # The mistune renderer is the default, because it's simple to depend on it
Thomas Kluyver
mistune rendering is the default
r17257 markdown2html = markdown2html_mistune
Thomas Kluyver
Make mistune a requirement for nbconvert
r17249
Jonathan Frederic
Cleanup and refactor of filters
r10676 def markdown2rst(source):
Paul Ivanov
urlencode images for rst files...
r15880 """Convert a markdown string to ReST via pandoc.
Jonathan Frederic
Transformer refactor
r10436
This function will raise an error if pandoc is not installed.
Any error messages generated by pandoc are printed to stderr.
Parameters
----------
Jonathan Frederic
Cleanup and refactor of filters
r10676 source : string
Jonathan Frederic
Transformer refactor
r10436 Input string, assumed to be valid markdown.
Returns
-------
out : string
Output as returned by pandoc.
"""
MinRK
add markdown2html filter...
r11268 return pandoc(source, 'markdown', 'rst')
Jonathan Frederic
nbconvert: Make sure node is atleast version 0.9.12
r15691 def _verify_node(cmd):
Jonathan Frederic
Cleanup
r15692 """Verify that the node command exists and is at least the minimum supported
Jonathan Frederic
nbconvert: Make sure node is atleast version 0.9.12
r15691 version of node.
Parameters
----------
cmd : string
Node command to verify (i.e 'node')."""
MinRK
handle nodejs executable on debian...
r15437 try:
Jonathan Frederic
Cleanup
r15692 out, err, return_code = get_output_error_code([cmd, '--version'])
except OSError:
Jonathan Frederic
Split logic onto multiple lines.
r15693 # Command not found
Jonathan Frederic
nbconvert: Make sure node is atleast version 0.9.12
r15691 return False
Jonathan Frederic
Split logic onto multiple lines.
r15693 if return_code:
# Command error
return False
return check_version(out.lstrip('v'), '0.9.12')