summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| |
* | merge with 1.0Georg Brandl2011-01-041-1/+1
|\ \ | |/
| * New year update.Georg Brandl2011-01-041-1/+1
| |
* | Add new env method to get the real path to a file reference, and use it.Georg Brandl2010-08-231-19/+5
| |
* | Mode "Ub" does not exist.Georg Brandl2010-07-281-1/+1
| |
* | open file in binary mode to get byte strings on python3Daniel Neuhäuser2010-06-071-1/+1
|/
* Do not use normpath when not necessary.Georg Brandl2010-07-231-1/+1
|
* merge with 0.6Georg Brandl2010-06-051-1/+1
|\
| * #440: Remove usage of a Python >= 2.5 API in the ``literalinclude`` directive.Georg Brandl2010-06-051-1/+1
| | | | | | | | CodecInfo is not a namedtuple, so accessing attributes on 2.4 fails.
* | merge with 0.6Georg Brandl2010-05-221-1/+3
|\ \ | |/
| * Fix for 12fea70b1a18: EncodedFile doesnt do the right thing either.Georg Brandl2010-05-221-1/+3
| |
| * #414: fix universal newline handling of files included with "literalinclude".Georg Brandl2010-05-221-1/+1
| | | | | | | | codecs.open() does not support U in the mode argument; use the EncodedFile wrapper instead.
* | merge with trunkGeorg Brandl2010-02-171-2/+2
|\ \
| * \ merge with 0.6Georg Brandl2010-02-071-2/+2
| |\ \ | | |/
| | * Make the ``start-after`` and ``end-before`` options to the ↵Georg Brandl2010-01-301-2/+2
| | | | | | | | | | | | ``literalinclude`` directive work correctly if not used together.
* | | merge with trunkGeorg Brandl2010-01-081-0/+3
|\ \ \ | |/ /
| * | Added ``tab-width`` option to ``literalinclude`` directive.Georg Brandl2010-01-081-0/+3
| | |
* | | merge with trunkGeorg Brandl2010-01-021-7/+6
|\ \ \ | |/ / |/| |
| * | Remove docutils 0.4 support.Georg Brandl2009-10-271-7/+6
| | |
* | | merge with 0.6Georg Brandl2010-01-011-1/+1
|\ \ \ | |/ / |/| / | |/
View Lorry Controller Status