Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 16:12:51 +11:00
Code Issues Projects Releases Packages Wiki Activity

First introduction of markup

Browse source
This commit is contained in:
Martin Mahner 2016-03-24 12:54:54 +01:00
parent d2341c9220
commit 82d49d0ed1
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dpaste/highlight.py
View file

@ -24,13 +24,18 @@ LEXER_LIST = sorted(LEXER_LIST)
# The list of lexers. Its not worth to autogenerate this. See above how to # The list of lexers. Its not worth to autogenerate this. See above how to
# retrieve this. # retrieve this.
PLAIN_TEXT = 'text' # lexer name whats rendered as text (paragraphs) PLAIN_TEXT = '_text_plain' # lexer name whats rendered as text (paragraphs)
PLAIN_CODE = 'plain' # lexer name of code with no hihglighting PLAIN_CODE = '_code' # lexer name of code with no hihglighting
LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', ( LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', (
(PLAIN_TEXT, 'Text'), (_('Text'), (
(PLAIN_CODE, 'Code'), ('_text_plain', 'Plain Text'),
(_('Highlighted'), ( ('_text_markdown', 'Markdown'),
('_text_rst', 'reStructuredText'),
('_text_textile', 'Textile'),
)),
(_('Code'), (
(PLAIN_CODE, 'Plain Code'),
('abap', 'ABAP'), ('abap', 'ABAP'),
('apacheconf', 'ApacheConf'), ('apacheconf', 'ApacheConf'),
('applescript', 'AppleScript'), ('applescript', 'AppleScript'),
@ -103,13 +108,20 @@ LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', (
)) ))
)) ))
LEXER_KEYS = [PLAIN_TEXT, PLAIN_CODE] + [i for i in dict(LEXER_LIST[2][1]).keys()] # Generate a list of all keys of all lexer
LEXER_KEYS = []
for i in LEXER_LIST:
for j, k in i[1]:
LEXER_KEYS.append(j)
# The default lexer is python # The default lexer is python
LEXER_DEFAULT = getattr(settings, 'DPASTE_LEXER_DEFAULT', 'python') LEXER_DEFAULT = getattr(settings, 'DPASTE_LEXER_DEFAULT', 'python')
# Lexers which have wordwrap enabled by default # Lexers which have wordwrap enabled by default
LEXER_WORDWRAP = getattr(settings, 'DPASTE_LEXER_WORDWRAP', ('text', 'rst')) LEXER_WORDWRAP = getattr(settings, 'DPASTE_LEXER_WORDWRAP',
('text', 'rst')
)
class NakedHtmlFormatter(HtmlFormatter): class NakedHtmlFormatter(HtmlFormatter):
def wrap(self, source, outfile): def wrap(self, source, outfile):

2
requirements.txt
View file

@ -7,6 +7,7 @@
# Project dependencies # Project dependencies
django==1.9.* django==1.9.*
django-mptt django-mptt
django-markup
pygments pygments
requests requests
@ -16,7 +17,6 @@ tox
docutils docutils
sphinx sphinx
sphinx_rtd_theme sphinx_rtd_theme
mysql-python
# Deployment specific # Deployment specific
django-redis==3.8.0 django-redis==3.8.0

1
setup.py
View file

@ -53,6 +53,7 @@ setup(
'django-mptt>=0.8.3', 'django-mptt>=0.8.3',
'pygments>=1.6', 'pygments>=1.6',
'requests>=2.0.0', 'requests>=2.0.0',
'django-markup>=1.0',
], ],
tests_require=[ tests_require=[
'tox>=1.6.1' 'tox>=1.6.1'