Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix line separator issue | Jeppe Pihl | 2014-10-06 | 1 | -3/+4 |
| | |||||
* | fixed bugs, and extended unit test to catch them again if they reappear | Jeppe Pihl | 2014-10-06 | 1 | -3/+4 |
| | |||||
* | merge | Jeppe Pihl | 2014-10-06 | 1 | -21/+56 |
|\ | |||||
| * | fixed issues with line numbering not being showed correctly. | Jeppe Pihl | 2014-10-02 | 1 | -17/+39 |
| | | |||||
| * | fix pep8 warnings | Jeppe Pihl | 2014-10-01 | 1 | -8/+8 |
| | | |||||
| * | #1583: Allow the line numbering of the directive `literalinclude` to match ↵ | Jeppe Pihl | 2014-09-30 | 1 | -11/+24 |
| | | | | | | | | that of the included file, using a new ``lineno-match`` option. | ||||
* | | Fix. <caption> node should not include <paragraph> block element as a result ↵ | shimizukawa | 2014-10-06 | 1 | -4/+7 |
|/ | | | | of nested_parse. | ||||
* | Fix by review comment | tk0miya | 2014-09-26 | 1 | -8/+4 |
| | |||||
* | Merge with default | tk0miya | 2014-09-24 | 1 | -8/+29 |
|\ | |||||
| * | do nested_parse() :caption: of code-block directive | tk0miya | 2014-09-19 | 1 | -9/+29 |
| | | |||||
* | | Fix a few missing Unicode/bytes filename problems. | Georg Brandl | 2014-09-21 | 1 | -2/+1 |
|/ | |||||
* | Merge upstream changes | tk0miya | 2014-08-20 | 1 | -10/+10 |
|\ | |||||
| * | Rename :filename: option of code-block directive to :caption: | tk0miya | 2014-08-11 | 1 | -10/+10 |
| | | |||||
* | | use six.string_types instead of text_types. | WAKAYAMA Shirou | 2014-08-13 | 1 | -3/+3 |
| | | | | | | | | also fix import path problem. | ||||
* | | according to comment, move import, use six.text_type, and use 'not'. | WAKAYAMA Shirou | 2014-08-13 | 1 | -3/+5 |
| | | |||||
* | | fix encoding problem in diff param in literalinclude. | WAKAYAMA Shirou | 2014-08-12 | 1 | -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. | WAKAYAMA Shirou | 2014-08-12 | 1 | -0/+14 |
|/ | | | | This solves issue #1134 with a pygments highlighting support. | ||||
* | * for pull request #258: update CHANGES, add tests, add a document and ↵ | shimizukawa | 2014-08-10 | 1 | -14/+20 |
| | | | | refactoring. | ||||
* | added dedent to codeblock | zsiddiqui2 | 2014-07-27 | 1 | -0/+10 |
| | |||||
* | added dedent | zsiddiqui2 | 2014-07-27 | 1 | -0/+7 |
| | |||||
* | Update copyright year. | Georg Brandl | 2014-03-01 | 1 | -9/+28 |
|\ | |||||
| * | Merge | Dmitry Shachnev | 2014-01-20 | 1 | -4/+4 |
| |\ | |||||
| | * | Modernize the code now that Python 2.5 is no longer supported | Dmitry Shachnev | 2014-01-19 | 1 | -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 Brandl | 2014-01-19 | 1 | -0/+6 |
| | | | |||||
| * | | Merge in pull request #172 from ↵ | Georg Brandl | 2014-01-19 | 1 | -0/+4 |
| |\ \ | | |/ | |/| | | | | https://bitbucket.org/nsmgr8/sphinx/branch/default | ||||
| | * | Add filename option to code-block | M Nasimul Haque | 2013-09-26 | 1 | -0/+4 |
| | | | | | | | | | | | | Prepend the given filename to the code block | ||||
| * | | Closes #668: Allow line numbering of ``code-block`` and ``literalinclude`` ↵ | Georg Brandl | 2014-01-11 | 1 | -5/+14 |
| |/ | | | | | | | | | | | directives #to start at an arbitrary line number, with a new ``lineno-start`` option. | ||||
* | | Update copyright year. | Georg Brandl | 2014-03-01 | 1 | -1/+1 |
|/ | |||||
* | Closes #1123: Allow whitespaces in filenames given to :rst:dir:`literalinclude`. | Georg Brandl | 2013-03-30 | 1 | -1/+1 |
| | |||||
* | Closes #810: fix remaining PendingDeprecationWarnings with Python 3. | Georg Brandl | 2013-03-07 | 1 | -1/+4 |
| | |||||
* | Copyright update. | Georg Brandl | 2013-01-01 | 1 | -1/+1 |
| | |||||
* | Merge with 1.0 | Georg Brandl | 2011-09-23 | 1 | -19/+32 |
|\ | |||||
| * | add :emphasize-lines: option to source-code and literal-include | Mark Lodato | 2011-07-06 | 1 | -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.0 | Georg Brandl | 2011-05-15 | 1 | -1/+7 |
| |\ | |||||
| * \ | merge with 1.0 | Georg Brandl | 2011-01-07 | 1 | -19/+5 |
| |\ \ | |||||
| | * \ | merge with 1.0 | Georg Brandl | 2011-01-04 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | Add new env method to get the real path to a file reference, and use it. | Georg Brandl | 2010-08-23 | 1 | -19/+5 |
| | | | | | |||||
| | * | | | Mode "Ub" does not exist. | Georg Brandl | 2010-07-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | open file in binary mode to get byte strings on python3 | DasIch | 2010-06-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix #648: Fix line numbers reported in warnings about undefined references. | Georg Brandl | 2011-09-23 | 1 | -3/+3 |
| |_|_|/ |/| | | | |||||
* | | | | Closes #675: Fix IndexErrors when including nonexisting lines with ↵ | Georg Brandl | 2011-05-15 | 1 | -1/+7 |
|/ / / | | | | | | | | | | :rst:dir:`literalinclude`. | ||||
* | | | Add line numbers to newly generated nodes. | Georg Brandl | 2011-01-07 | 1 | -0/+2 |
| |/ |/| | |||||
* | | New year update. | Georg Brandl | 2011-01-04 | 1 | -1/+1 |
|/ | |||||
* | Do not use normpath when not necessary. | Georg Brandl | 2010-07-23 | 1 | -1/+1 |
| | |||||
* | merge with 0.6 | Georg Brandl | 2010-06-05 | 1 | -8/+19 |
|\ | |||||
| * | merge with 0.6 | Georg Brandl | 2010-05-22 | 1 | -8/+19 |
| |\ | |||||
| | * | merge with trunk | Georg Brandl | 2010-02-17 | 1 | -2/+2 |
| | |\ | |||||
| | | * | merge with 0.6 | Georg Brandl | 2010-02-07 | 1 | -1/+13 |
| | | |\ | |||||
| | * | \ | merge with trunk | Georg Brandl | 2010-01-08 | 1 | -7/+6 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | merge with trunk | Georg Brandl | 2010-01-02 | 1 | -1/+1 |
| | | |\ \ |