diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2012-09-14 14:27:12 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2012-09-14 14:27:12 +0000 |
| commit | 1f84f50d0ac04b64d8f7b061199b6e521fef3b3a (patch) | |
| tree | 2a92b846819b392682e86690a25351bc65617d21 /docutils/parsers/rst | |
| parent | fa7f004a62410c9118bc5925b5a95e73a136cf8b (diff) | |
| download | docutils-1f84f50d0ac04b64d8f7b061199b6e521fef3b3a.tar.gz | |
Change default of "syntax highlight" option to "long",
Add basic syntax highlight styles for LaTeX and HTML.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7514 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils/parsers/rst')
| -rw-r--r-- | docutils/parsers/rst/__init__.py | 2 | ||||
| -rw-r--r-- | docutils/parsers/rst/roles.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/docutils/parsers/rst/__init__.py b/docutils/parsers/rst/__init__.py index 4caf75f76..1e52609f6 100644 --- a/docutils/parsers/rst/__init__.py +++ b/docutils/parsers/rst/__init__.py @@ -136,7 +136,7 @@ class Parser(docutils.parsers.Parser): '"long", "short", or "none (no parsing)". Default is "short".', ['--syntax-highlight'], {'choices': ['long', 'short', 'none'], - 'default': 'short', 'metavar': '<format>'}),)) + 'default': 'long', 'metavar': '<format>'}),)) config_section = 'restructuredtext parser' config_section_dependencies = ('parsers',) diff --git a/docutils/parsers/rst/roles.py b/docutils/parsers/rst/roles.py index 73ec479e6..750fe33cc 100644 --- a/docutils/parsers/rst/roles.py +++ b/docutils/parsers/rst/roles.py @@ -320,11 +320,10 @@ def code_role(role, rawtext, text, lineno, inliner, options={}, content=[]): set_classes(options) language = options.get('language', '') classes = ['code'] - if language: - classes.append(language) if 'classes' in options: classes.extend(options['classes']) - + if language and language not in classes: + classes.append(language) try: tokens = Lexer(utils.unescape(text, 1), language, inliner.document.settings.syntax_highlight) |