summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
Commit message (Collapse)AuthorAgeFilesLines
* Fix #2931: code-block directive with same :caption: causes warning of ↵Takeshi KOMIYA2016-09-171-2/+0
| | | | duplicate target
* Fix parsing errors for caption of code-blocks are displayed in document ↵Takeshi KOMIYA2016-08-121-2/+15
| | | | (ref: #2845)
* 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-9/+0
| |
* | Fix #2113: Allow ``:class:`` option to code-block directiveTakeshi KOMIYA2015-12-201-0/+4
| |
* | Fix #1790 literalinclude strips empty lines at the head and tailTakeshi KOMIYA2015-03-311-9/+0
|/
* Fix #1770: regard empty file as an empty stringTakayuki Hirai2015-03-141-1/+1
|
* refs #1742: `:name:` option is provided for `toctree`, `code-block` and ↵shimizukawa2015-03-081-4/+15
| | | | `literalinclude` dirctives.
* Closes #1630: resolve CSS conflicts, ``div.container`` css target for ↵shimizukawa2015-02-231-1/+2
| | | | literal block wrapper now renamed to ``div.literal-block-wrapper``.
* Merge branch 'stable'Georg Brandl2015-01-031-1/+1
|\
| * all: update copyrightGeorg Brandl2015-01-031-1/+1
| |
* | fix line separator issueJeppe Pihl2014-10-061-3/+4
| |
* | fixed bugs, and extended unit test to catch them again if they reappearJeppe Pihl2014-10-061-3/+4
| |
* | mergeJeppe Pihl2014-10-061-4/+7
|\ \
| * | Fix. <caption> node should not include <paragraph> block element as a result ↵Takayuki Shimizukawa2014-10-061-4/+7
| | | | | | | | | | | | of nested_parse.
* | | fixed issues with line numbering not being showed correctly.Jeppe Pihl2014-10-021-17/+39
| | |
* | | fix pep8 warningsJeppe Pihl2014-10-011-8/+8
| | |
* | | #1583: Allow the line numbering of the directive `literalinclude` to match ↵Jeppe Pihl2014-09-301-11/+24
|/ / | | | | | | that of the included file, using a new ``lineno-match`` option.
* | Fix by review commenttk0miya2014-09-261-8/+4
| |
* | Merge with defaulttk0miya2014-09-241-1/+1
|\ \
| * | Fix a few missing Unicode/bytes filename problems.Georg Brandl2014-09-211-2/+1
| | |
* | | do nested_parse() :caption: of code-block directivetk0miya2014-09-191-9/+29
|/ /
* | Merge upstream changestk0miya2014-08-201-16/+45
|\ \
| * | use six.string_types instead of text_types.shirou2014-08-131-3/+3
| | | | | | | | | | | | also fix import path problem.
| * | according to comment, move import, use six.text_type, and use 'not'.shirou2014-08-131-3/+5
| | |
| * | fix encoding problem in diff param in literalinclude.shirou2014-08-121-19/+32
| | | | | | | | | | | | This commit creates read_with_encoding which read from file with encoding. It is used normal file read and also diff file read.
| * | add 'diff' parameter to literalinclude.shirou2014-08-121-0/+14
| | | | | | | | | | | | This solves issue #1134 with a pygments highlighting support.
* | | Rename :filename: option of code-block directive to :caption:tk0miya2014-08-111-10/+10
|/ /
* | * for pull request #258: update CHANGES, add tests, add a document and ↵Takayuki Shimizukawa2014-08-101-14/+20
| | | | | | | | refactoring.
* | added dedent to codeblockzsiddiqui22014-07-271-0/+10
| |
* | added dedentzsiddiqui22014-07-271-0/+7
| |
* | Update copyright year.Georg Brandl2014-03-011-1/+1
|\ \ | |/
| * Update copyright year.Georg Brandl2014-03-011-1/+1
| |
* | MergeDmitry Shachnev2014-01-201-4/+4
|\ \
| * | Modernize the code now that Python 2.5 is no longer supportedDmitry Shachnev2014-01-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use print function instead of print statement; - Use new exception handling; - Use in operator instead of has_key(); - Do not use tuple arguments in functions; - Other miscellaneous improvements. This is based on output of `futurize --stage1`, with some manual corrections.
* | | Add :filename: also for literalinclude. Changelog entry.Georg Brandl2014-01-191-0/+6
| | |
* | | Merge in pull request #172 from ↵Georg Brandl2014-01-191-0/+4
|\ \ \ | |/ / |/| | | | | https://bitbucket.org/nsmgr8/sphinx/branch/default
| * | Add filename option to code-blockM. Nasimul Haque2013-09-261-0/+4
| |/ | | | | | | Prepend the given filename to the code block
* | Closes #668: Allow line numbering of ``code-block`` and ``literalinclude`` ↵Georg Brandl2014-01-111-5/+14
|/ | | | | | directives #to start at an arbitrary line number, with a new ``lineno-start`` option.
* Closes #1123: Allow whitespaces in filenames given to :rst:dir:`literalinclude`.Georg Brandl2013-03-301-1/+1
|
* Closes #810: fix remaining PendingDeprecationWarnings with Python 3.Georg Brandl2013-03-071-1/+4
|
* Copyright update.Georg Brandl2013-01-011-1/+1
|
* Merge with 1.0Georg Brandl2011-09-231-3/+3
|\
| * Fix #648: Fix line numbers reported in warnings about undefined references.Georg Brandl2011-09-231-3/+3
| |
* | add :emphasize-lines: option to source-code and literal-includeMark Lodato2011-07-061-0/+27
| | | | | | | | | | | | | | | | Add a new option, :emphasize-lines:, to the source-code and literal-include directives. The format is the same as the :lines: option for literal-include. The resulting list of lines is passed to the Pygments formatter as 'hl_lines', which is only honored by the HTML formatter.
* | merge with 1.0Georg Brandl2011-05-151-1/+7
|\ \ | |/
| * Closes #675: Fix IndexErrors when including nonexisting lines with ↵Georg Brandl2011-05-151-1/+7
| | | | | | | | :rst:dir:`literalinclude`.
* | merge with 1.0Georg Brandl2011-01-071-0/+2
|\ \ | |/
| * Add line numbers to newly generated nodes.Georg Brandl2011-01-071-0/+2
| |
View Lorry Controller Status