summaryrefslogtreecommitdiff
path: root/sphinx/highlighting.py
Commit message (Collapse)AuthorAgeFilesLines
...
* | Upgrade to mypy-0.5Takeshi KOMIYA2017-03-031-1/+1
| |
* | Add mypy annotationsTakeshi KOMIYA2017-02-101-6/+16
| |
* | Use sphinx.util.logging instead app.warn()Takeshi KOMIYA2017-01-021-12/+12
| |
* | Merge branch 'stable'Takeshi KOMIYA2016-12-201-1/+1
|\ \ | |/
| * Fix the warning type ``misc.highlighting_failure`` does not workTakeshi KOMIYA2016-12-201-1/+1
| |
* | Merge branch '1.5-release' into mastershimizukawa2016-12-051-1/+2
|\ \ | |/
| * Fix #3185: Add new warning type ``misc.highlighting_failure``Takeshi KOMIYA2016-12-031-1/+2
| |
* | Add type-check annotations to sphinx.*Takeshi KOMIYA2016-11-161-1/+2
|/
* Highlighting fallbacks by defaultTakeshi KOMIYA2016-02-201-53/+5
| | | | | | | | | | In 423bf7b, I tried to add fallback mechanism to ``python3``. But it breaks the python3 highlighting on python2 environment. This adds ``'default'`` to highlighting languages; it works like ``'python3'``, but fallbacks if failed Highlighting. And this removes try-parse step from ``'python3'`` language. Now, it highlights regardless of runtime environments. Thanks to Yoshiki SHIBUKAWA.
* Fix code-block literals raises highlighting warnings by defaultTakeshi KOMIYA2016-02-171-6/+6
|
* The default highlight language is now Python 3.Georg Brandl2016-02-141-6/+10
| | | | | | | | References: #2279. This means that source code is highlighted as Python 3 (which is mostly a superset of Python 2), and no parsing is attempted to distinguish valid code.
* Merge branch 'stable'Takeshi KOMIYA2016-01-181-1/+5
|\
| * Fix #1565: Show warning if Pygments throws an ErrorTokenTakeshi KOMIYA2016-01-181-1/+5
| |
* | Merge branch 'stable'Georg Brandl2016-01-141-1/+1
|\ \ | |/
| * Obligatory copyright update.Georg Brandl2016-01-141-1/+1
| |
| * Fix #1790 literalinclude strips empty lines at the head and tailTakeshi KOMIYA2015-04-021-6/+6
| |
* | FIX : fix syntax error in python 3.5Thomas A Caswell2015-05-121-1/+1
| | | | | | | | | | Be explicit about grouping between `**` in call and the `or` expression.
* | Fix #1790 literalinclude strips empty lines at the head and tailTakeshi KOMIYA2015-03-311-6/+6
|/
* pep8 fixesGeorg Brandl2015-03-081-2/+2
|
* Fix #1620: Use VerbatimBorderColor to add frame to code-block in LaTeXTakeshi KOMIYA2015-01-181-3/+1
|
* highlighting: fix potential TypeErrorGeorg Brandl2015-01-061-1/+1
|
* Add highlight_options configuration valueEricFromCanada2015-01-051-2/+2
| | | | | | | | | | | | This changeset adds the `highlight_options` configuration value, which specifies a dict of key-value pairs to pass to the Pygments highlighter specified with `highlight_language`. For example, specifying `highlight_options = {'funcnamehighlighting' : False}` for the 'php' lexer will disable function name highlighting. Both the HTML and LaTeX writers have been updated to include the options when calling `highlight_block()`, as long as the currently selected language matches what was set with `highlight_language`, i.e. not when modified by `highlight::` or `code-block::` directives.
* Merge branch 'stable'Georg Brandl2015-01-031-1/+1
|\
| * all: update copyrightGeorg Brandl2015-01-031-1/+1
| |
* | Add frame to code-block in LaTeXtk0miya2014-10-081-1/+3
| |
* | Make pygments unconditional, it is required by setup.py anyway.Georg Brandl2014-09-211-43/+20
| |
* | remove 'six' name except importing line.Takayuki Shimizukawa2014-04-301-3/+2
| |
* | use six privided text_type() to replace with unicode() to support py2/py3 in ↵Takayuki Shimizukawa2014-04-291-3/+4
| | | | | | | | one source. refs #1350.
* | introduce the six module and reduce sphinx.util.pycompat implementation. ↵Takayuki Shimizukawa2014-04-291-2/+3
| | | | | | | | refs #1350.
* | merge with stableGeorg Brandl2014-03-251-1/+7
|\ \ | |/
| * Closes #636: Keep straight single quotes in literal blocks in the LaTeX build.Georg Brandl2014-03-251-1/+7
| |
* | Update copyright year.Georg Brandl2014-03-011-1/+1
|\ \ | |/
| * Update copyright year.Georg Brandl2014-03-011-1/+1
| |
* | merge headsTakayuki Shimizukawa2014-01-151-17/+1
|\ \ | |/ |/|
| * Drop python-3.1 and remove support codesTakayuki Shimizukawa2013-12-151-6/+0
| |
| * Drop python-2.5 and remove 2.4,2.5 support codesTakayuki Shimizukawa2013-12-151-11/+1
| |
* | Closes #845: In code blocks, when the selected lexer fails, display line ↵Georg Brandl2014-01-111-11/+11
|/ | | | numbers nevertheless if configured.
* Copyright update.Georg Brandl2013-01-011-1/+1
|
* Only select 3.x versions.Georg Brandl2012-10-281-2/+2
|
* Merged in shimizukawa/sphinx-fix-testing-fork (pull request #62)Georg Brandl2012-10-281-0/+6
|\
| * fix for Python3.1: Python 3.1 can't proceess '\r' at parser; ↵Takayuki Shimizukawa2012-05-031-0/+6
| | | | | | | | `parser.suite("print('hello')\r\n")` cause error.
* | Closes #905: work around Pygments bug returning str instead of Unicode from ↵Georg Brandl2012-08-191-0/+2
|/ | | | Latex formatter for empty input.
* Closes #810: fix deprecation warnings with Python 3. What is left over is ↵Georg Brandl2012-01-291-2/+2
| | | | from nose or docutils.
* Closes #695: When the highlight language "python" is specified explicitly, ↵Georg Brandl2012-01-291-2/+4
| | | | | | do not try to parse the code to recognize non-Python snippets. Thanks to Jonas Haag for the patch.
* More version-compatibility hack removals.Georg Brandl2011-09-251-7/+1
|
* Remove compatibility code for Pygments < 1.2.Georg Brandl2011-09-251-13/+10
|
* Add changelog entry for emphasize-lines and some coding style fixes.Georg Brandl2011-09-221-5/+4
|
* PygmentsBridge: pass keyword arguments to PygmentsMark Lodato2011-07-061-2/+2
| | | | | | In Pygments.highlight_block, pass all extra keyword arguments, including linenos, directly to the Pygments formatter. This allows custom directives to use other Pygments features.
* PygmentsBridge: construct new formatter each timeMark Lodato2011-07-061-13/+18
| | | | | | | | Previously, we pre-constructed two different formatters, one with line numbers and one without. This made the code rather confusing and also was not scalable for options that take arguments, such as 'hl_lines'. Now, we construct a new HTMLFormatter or LatexFormatter on each call to highlight_block().
* changeset: 3201:2a38261315baGeorg Brandl2011-01-091-3/+3
| | | | | | | | tag: tip parent: 3199:cd7b0a8d99c6 user: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> date: Sun Jan 09 20:55:13 2011 +0100 summary: Trim <BLANKLINE> just like doctest flags.