aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clean up a few typos and formatting issues.Waylan Limberg2015-01-012-55/+51
|
* More refactor of TOC Extension.Waylan Limberg2015-01-011-24/+24
| | | | | | Mostly just code cleanup so it reads better. Renamed a few internal things. I didn't write this extension originally so most of this would have been done a long time ago. I just havn't touched this code much till now.
* Merge branch 'master' of https://github.com/waylan/Python-MarkdownWaylan Limberg2015-01-011-1/+1
|\
| * Merge pull request #381 from svetlyak40wt/patch-1Waylan Limberg2014-12-311-1/+1
| |\ | | | | | | Fix a small typo
| | * Fix a small typoAlexander Artemenko2014-12-311-1/+1
| |/
* / HeaderId Extension marked as Pending Deprecation.Waylan Limberg2015-01-016-157/+289
|/ | | | | | | | | | | | | | | | | | | | Use the Table of Contents Extension instead. The HeaderId Extension will raise a PendingDeprecationWarning. The last few features of the HeaderID extension were mirgrated to TOC including the baselevel and separator config options. Also, the marker config option of TOC can be set to an empty string to disable searching for a marker. The `slugify`, `unique` and `stashedHTML2text` functions are now defined in the TOC extension in preperation for the HeaderId extension being removed. All coresponding tests are now run against the TOC Extension. The meta-data support of the HeaderId Extension was not migrated and no plan exists to make that migration. The `forceid` config option makes no sense in the TOC Extension and the only other config setting supported by meta-data was the `header_level`. However, as that depends on the template, it makes more sense to not be defined at the document level.
* Added first draft of 2.6 release notes.Waylan Limberg2014-12-305-6/+142
|
* PendingDeprecationWarning (v2.5) => DeprecationWarning (v2.6)Waylan Limberg2014-12-303-41/+35
|
* Preserve order of nested headers in TOCWaylan Limberg2014-12-304-49/+108
| | | | | | | | | Fixes #380. The TOC replacement is now seperate from building the TOC, which allows us to iter through the doc in order rather than with the non-order-preserving interparent pethod. This is almost a complete refactor of the run method. Also cleaned up the config stuff. Thanks to @colewerner for the report and test case.
* Merge branch 'temp'Waylan Limberg2014-12-302-14/+54
|\ | | | | | | | | Conflicts: tests/test_extensions.py
| * Complete test coverage of TOC ExtensionWaylan Limberg2014-12-302-8/+48
| |
| * Always add toc to Markdown Class InstanceWaylan Limberg2014-12-301-6/+6
| | | | | | | | | | | | | | | | Previously, we only added the toc attribute (md.toc) if no Marker was found within the document. However, that has caused framworks to do things like force insert a marker, run convert, then extract the toc from the body of the document. This is much cleaner. And if the user wants to add the toc to the document also, they still can.
| * Add reset support to TOC extension.Waylan Limberg2014-12-302-0/+14
| | | | | | | | | | | | Now, whenever the TOC extensiuon is loaded, the Markdown class instance will always have a toc attribute (md.toc). Calling md.reset() will also reset the toc attribute which defaults to an empty string.
* | Fix testWaylan Limberg2014-12-301-12/+1
| |
* | Add reset support to TOC extension.Waylan Limberg2014-12-302-0/+25
|/ | | | | | Now, whenever the TOC extensiuon is loaded, the Markdown class instance will always have a toc attribute (md.toc). Calling md.reset() will also reset the toc attribute which defaults to an empty string.
* Better docs of treeprocessor API.Waylan Limberg2014-12-291-3/+14
| | | Fixes #375. Explains the difference between returning None and returning a modified root element. Also makes the docs more consistent with the doc strings in the code.
* Merge pull request #378 from d0ugal/docs-fixWaylan Limberg2014-12-231-4/+5
|\ | | | | Correct the documentation for the slugify function
| * Correct the documentation for the slugify functionDougal Matthews2014-12-221-4/+5
| | | | | | | | | | The previous requirements are incorrect, the method needs to accept two parameters.
* | Merge pull request #376 from msabramo/flake8Waylan Limberg2014-12-092-11/+15
|\ \ | | | | | | flake8ify
| * | flake8ifyMarc Abramowitz2014-12-092-11/+15
|/ /
* | Merge branch 'kernc-meta_yaml'Waylan Limberg2014-11-304-14/+110
|\ \
| * | Add YAML support to Meta extensionKernc2014-11-303-13/+109
| | | | | | | | | | | | | | | | | | | | | | | | By default, this only supports YAML deliminators (`---`) and adds no additional behavior. In other words, parsing is unchanged. However, with the `yaml` option set, PyYAML will parse the metadata. Thanks to @kernc for suggesting the idea and doing the work on this.
| * | Upped version to 2.6.devWaylan Limberg2014-11-301-1/+1
| | | | | | | | | | | | We are ready to start adding/changing features now.
| * | Updated author emailWaylan Limberg2014-11-302-2/+3
| |/
* / Updated author emailWaylan Limberg2014-11-302-2/+3
|/
* Removed 3.1 env from toxWaylan Limberg2014-11-201-1/+1
|
* Added flake8 to tox and travisWaylan Limberg2014-11-202-1/+9
|
* Completed flake8 cleanup.Waylan Limberg2014-11-204-261/+482
| | | | | I've decided to go with longer lines in the tests. Also fixed a couple errors with the previous cleanup.
* Flake8 cleanup (mostly whitespace).Waylan Limberg2014-11-2034-708/+955
| | | | | | Got all but a couple files in the tests (ran out of time today). Apparently I have been using some bad form for years (although a few things seemed to look better before the update). Anyway, conformant now.
* Added 2.5.2 to changelog.Waylan Limberg2014-11-201-0/+2
|
* Upped version to 2.5.2.2.5.2-finalWaylan Limberg2014-11-191-1/+1
|
* Merge pull request #371 from facelessuser/masterWaylan Limberg2014-11-193-5/+27
|\ | | | | Issue #368: Fix Markdown in raw HTML stops working
| * Issue #368: Fix Markdown in raw HTML stops workingfacelessuser2014-11-193-5/+27
| | | | | | | | | | | | | | Originally there was an infinite loop issue that was patched in issue #308. Unfortunately, it was fixed all the way. This fix patches the infinite loop fix to only add an offset to the `right_listindex` when it is in a infinite loop scenario.
* | Merge pull request #367 from facelessuser/masterWaylan Limberg2014-11-174-51/+56
|\| | | | | Fix issue #365 and #366
| * Issue #366 Recursion error in toc extfacelessuser2014-11-171-48/+47
| | | | | | | | | | | | | | | | This reworks the toc ordering to be done in a single pass with no recursion. Very long documents with lots of headers can actually exceed Python’s max recursion limit. By handling the toc ordering with no recursion, large documents can no longer cause toc to fail with recursion erros.
| * Issue #365 Bold/Italic nesting fixfacelessuser2014-11-173-3/+9
|/ | | | | | | | | | | The logic for the current regex for strong/em and em/strong was sound, but the way it was implemented caused some unintended side effects. Whether it is a quirk with regex in general or just with Python’s re engine, I am not sure. Put basically `(\*|_){3}` causes issues with nested bold/italic. So, allowing the group to be defined, and then using the group number to specify the remaining sequential chars is a better way that works more reliably `(\*|_)\2{2}. Test from issue #365 was also added to check for this case in the future.
* Make TestCodeHilite tests working with Pygments 2.0rc1.Dmitry Shachnev2014-11-041-9/+5
| | | | Fixes #361.
* Updated nl2br example in docs.Waylan Limberg2014-10-281-1/+1
| | | Fixes #359. Thanks for the report @gremmie.
* Merge pull request #360 from topless/patch-1Waylan Limberg2014-10-241-1/+1
|\ | | | | Changed logging level when loading extensions
| * Changed logging level when loading extensionsChris Topaloudis2014-10-241-1/+1
|/ | | So it suppresses messages for loaded extensions when its used as third party.
* Merge pull request #358 from facelessuser/masterWaylan Limberg2014-10-183-2/+5
|\ | | | | Fix tail out of order issue
| * Fix tail out of order issuefacelessuser2014-10-183-2/+5
|/ | | | | | | | | | | | This issue was discovered when dealing with nested inlines. In treeprocessors.py it was incorrectly handling tails. In short, tail elements were being inserted earlier than they were supposed to be. In order to fix this, the insertion index should be incremented by 1 so that when the tails are inserted into the parent, they will be just after the child they came from. Also added a test in nested-patterns to catch this issue.
* Merge pull request #350 from facelessuser/masterWaylan Limberg2014-10-061-10/+10
|\ | | | | Use Pygments API
| * Use Pygments APIfacelessuser2014-10-041-10/+10
|/
* Upped version to 2.5.12.5.1-finalWaylan Limberg2014-09-263-7/+6
| | | | Also removed an inacurate statement in the 2.5 release notes.
* Run Meta after whitespace normalizationWaylan Limberg2014-09-261-1/+1
| | | | Fixes #343. Thanks for the report @AlexJF.
* Better nested STRONG EM support.Waylan Limberg2014-09-263-2/+47
| | | | | | | | | Fixes #253. Thanks to @facelessuser for the tests. Although I removed a bunch of weird ones (even some that passed) from his PR (#342). For the most part, there is no definitive way for those to be parsed. So there is no point of testing for them. In most of those situations, authors should be mixing underscores and astericks so it is clear what is intended.
* Fix the lost tail issue in inlineprocessors.facelessuser2014-09-263-23/+40
| | | | | | See #253. Prior to this patch, if any inline processors returned an element with a tail, the tail would end up empty. This resolves that issue and will allow for #253 to be fixed. Thanks to @facelessuser for the work on this.
* Added a temp workwround for deprecated short ext names.Waylan Limberg2014-09-252-9/+10
| | | | | | | | | | | | As we chnaged the order in import trys for short names extensions (no dot syntax), an extra test was added to the import code for the occassion when a naming conflict exists. For example, if PyTables is installed (module name is tables) and the user tries to use the short name 'tables' instead of 'markdown.extensions.tables'. Fixes #341. Of course, this code will get ripped out when the old behavior is fully deprecated.
* Fixed TOC Option parsing.Waylan Limberg2014-09-252-3/+16
| | | | | | The new option parser assumes bool values if the default is bool or None. As the "title" option is not a bool value, it should default to an empty string rather than None. Fixes #347.