summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
Commit message (Expand)AuthorAgeFilesLines
* 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-21/+56
|\
| * 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 th...Jeppe Pihl2014-09-301-11/+24
* | Fix. <caption> node should not include <paragraph> block element as a result ...shimizukawa2014-10-061-4/+7
|/
* Fix by review commenttk0miya2014-09-261-8/+4
* Merge with defaulttk0miya2014-09-241-8/+29
|\
| * do nested_parse() :caption: of code-block directivetk0miya2014-09-191-9/+29
* | Fix a few missing Unicode/bytes filename problems.Georg Brandl2014-09-211-2/+1
|/
* Merge upstream changestk0miya2014-08-201-10/+10
|\
| * Rename :filename: option of code-block directive to :caption:tk0miya2014-08-111-10/+10
* | use six.string_types instead of text_types.WAKAYAMA Shirou2014-08-131-3/+3
* | according to comment, move import, use six.text_type, and use 'not'.WAKAYAMA Shirou2014-08-131-3/+5
* | fix encoding problem in diff param in literalinclude.WAKAYAMA Shirou2014-08-121-19/+32
* | add 'diff' parameter to literalinclude.WAKAYAMA Shirou2014-08-121-0/+14
|/
* * for pull request #258: update CHANGES, add tests, add a document and refact...shimizukawa2014-08-101-14/+20
* added dedent to codeblockzsiddiqui22014-07-271-0/+10
* added dedentzsiddiqui22014-07-271-0/+7
* Update copyright year.Georg Brandl2014-03-011-9/+28
|\
| * MergeDmitry Shachnev2014-01-201-4/+4
| |\
| | * Modernize the code now that Python 2.5 is no longer supportedDmitry Shachnev2014-01-191-4/+4
| * | Add :filename: also for literalinclude. Changelog entry.Georg Brandl2014-01-191-0/+6
| * | Merge in pull request #172 from https://bitbucket.org/nsmgr8/sphinx/branch/de...Georg Brandl2014-01-191-0/+4
| |\ \ | | |/ | |/|
| | * Add filename option to code-blockM Nasimul Haque2013-09-261-0/+4
| * | Closes #668: Allow line numbering of ``code-block`` and ``literalinclude`` di...Georg Brandl2014-01-111-5/+14
| |/
* | Update copyright year.Georg Brandl2014-03-011-1/+1
|/
* 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-19/+32
|\
| * add :emphasize-lines: option to source-code and literal-includeMark Lodato2011-07-061-0/+27
| * merge with 1.0Georg Brandl2011-05-151-1/+7
| |\
| * \ merge with 1.0Georg Brandl2011-01-071-19/+5
| |\ \
| | * \ merge with 1.0Georg 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 python3DasIch2010-06-071-1/+1
* | | | | Fix #648: Fix line numbers reported in warnings about undefined references.Georg Brandl2011-09-231-3/+3
| |_|_|/ |/| | |
* | | | Closes #675: Fix IndexErrors when including nonexisting lines with :rst:dir:`...Georg Brandl2011-05-151-1/+7
|/ / /
* | | Add line numbers to newly generated nodes.Georg Brandl2011-01-071-0/+2
| |/ |/|
* | New year update.Georg Brandl2011-01-041-1/+1
|/
* Do not use normpath when not necessary.Georg Brandl2010-07-231-1/+1
* merge with 0.6Georg Brandl2010-06-051-8/+19
|\
| * merge with 0.6Georg Brandl2010-05-221-8/+19
| |\
| | * merge with trunkGeorg Brandl2010-02-171-2/+2
| | |\
| | | * merge with 0.6Georg Brandl2010-02-071-1/+13
| | | |\
| | * | \ merge with trunkGeorg Brandl2010-01-081-7/+6
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | merge with trunkGeorg Brandl2010-01-021-1/+1
| | | |\ \
View Lorry Controller Status