Skip to content

adds support for linenostart #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

adds support for linenostart #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0356e64
adds support for linenostart
a-tal Jun 14, 2015
ee1dbe7
adds test for linenostart
a-tal Jun 15, 2015
fd42c86
add Pygments to install
a-tal Jun 15, 2015
a7f238d
-,
a-tal Jun 15, 2015
e97792a
explicit skip
a-tal Jun 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions markdown/extensions/codehilite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ class CodeHilite(object):

def __init__(self, src=None, linenums=None, guess_lang=True,
css_class="codehilite", lang=None, style='default',
noclasses=False, tab_length=4, hl_lines=None, use_pygments=True):
noclasses=False, tab_length=4, hl_lines=None, linenostart=1,
use_pygments=True):
self.linenostart = linenostart
self.src = src
self.lang = lang
self.linenums = linenums
Expand Down Expand Up @@ -119,7 +121,8 @@ def hilite(self):
cssclass=self.css_class,
style=self.style,
noclasses=self.noclasses,
hl_lines=self.hl_lines)
hl_lines=self.hl_lines,
linenostart=self.linenostart)
return highlight(self.src, lexer, formatter)
else:
# just escape and build markup usable by JS highlighting libs
Expand Down Expand Up @@ -170,6 +173,7 @@ def _parseHeader(self):
\s* # Arbitrary whitespace
# Optional highlight lines, single- or double-quote-delimited
(hl_lines=(?P<quot>"|')(?P<hl_lines>.*?)(?P=quot))?
(linenostart=(?P<linenostart>[0-9]*))?
''', re.VERBOSE)
# search first line for shebang
m = c.search(fl)
Expand All @@ -187,6 +191,10 @@ def _parseHeader(self):
self.linenums = True

self.hl_lines = parse_hl_lines(m.group('hl_lines'))
linenostart = m.group('linenostart')
if linenostart:
# this will allow starting line 0
self.linenostart = int(linenostart)
else:
# No match
lines.insert(0, fl)
Expand Down
9 changes: 9 additions & 0 deletions tests/test_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,15 @@ def testUsePygmentsFalse(self):
'</code></pre>'
)

def testUseLineNoStart(self):
if not self.has_pygments:
self.skipTest("linenos only supported with Pygments")
text = '\t:::Python linenostart=42\n\t# A Code Comment'
md = markdown.Markdown(extensions=[
markdown.extensions.codehilite.CodeHiliteExtension(linenums=True)
])
self.assertIn("42", md.convert(text))


class TestFencedCode(unittest.TestCase):
""" Test fenced_code extension. """
Expand Down