aboutsummaryrefslogtreecommitdiffstats
path: root/markdown
Commit message (Collapse)AuthorAgeFilesLines
* Dict.keys() does not return a list in Python 3.Waylan Limberg2013-02-272-2/+2
|
* Merge branch '2and3'Waylan Limberg2013-02-2729-291/+324
|\
| * Now using universal code for Python 2 & 3.Waylan Limberg2013-02-2728-258/+311
| | | | | | | | | | | | | | | | | | | | The most notable changes are the use of unicode_literals and absolute_imports. Actually, absolute_imports was the biggest deal as it gives us relative imports. For the first time extensions import markdown relative to themselves. This allows other packages to embed the markdown lib in a subdir of their project and still be able to use our extensions.
| * Simlify importing ElementTreeWaylan Limberg2013-02-262-33/+13
| | | | | | | | | | | | As we no longer support older python versions, importing ElementTree is much simpler. The documented way for extensions to use etree still remains the same.
* | Missed a set.append -> set.add.Waylan Limberg2013-02-251-1/+1
| |
* | Consistant parsing of attr_lists in Python3.3Waylan Limberg2013-02-251-2/+2
|/ | | | | | Fixes #194. The NAME_RE regex was failing in Python 3.3 with the range `\u10000-\ueffff`. Also, in Python =< 3.2 the range `\u0300-\u036f` matches a colon but not in Python 3.3.
* Change `set.append` -> `set.add` in `headerid.unique`Waylan Limberg2013-02-222-3/+3
| | | | | | | | | Fixes #195. This was getting missed because the HeadrerId extension's reset method was resetting the IDs to a list. However, some third party extensions may want to call the unique function and it should work as documented. Interestingly, the TOC extension was using it and passing in a list as well. All fixed now. Also added a test of the `unique` function directly so we shouldn't repeat this in the future.
* More TOC cleanup and added tests.Waylan Limberg2013-02-191-2/+2
|
* TOC list item names must use text from all children.Waylan Limberg2013-02-191-1/+1
|
* Updated toc extension to work with changes @ 4ff74e3.Waylan Limberg2013-02-191-2/+2
|
* Ensure toc attribute is available on Markdown class.Waylan Limberg2013-02-191-3/+3
| | | | | | This appears to have recently been broken with the fixes in #191. This time I've added tests to prevent future breakage and added documentation to explain the behavior.
* Do not use assigned names "next" and "id", rename to order_toc_list and ↵benjaoming2013-02-181-18/+20
| | | | clean up code
* code cleanupbenjaoming2013-02-181-13/+12
|
* Make TocTreeprocessor extendable and be more gentle on badly structured headingsbenjaoming2013-02-171-63/+126
|
* Allow better linenum override in CodeHiliteWaylan Limberg2013-02-141-10/+23
| | | | | | | | | | | Fixes #148. The "force_linenos" config setting of the CodeHilite extension has been marked as Pending Deprecation and a new setting "linenums" has been added to replace it. See documentation for the [CodeHilite Extension] for an explaination of the new "linenums" setting. The new setting will honor the old "force_linenos" if it is set, but it will raise a PendingDeprecationWarning and will likely be removed in a future version of Python-Markdown. [CodeHilite Extension]: extensions/codehilite.html
* Preserve all blank lines in code blocks.Waylan Limberg2013-02-142-14/+14
| | | | | | | | | | | | Fixes #183. Finally got this working properly. The key was using a regex substitution with non-overlapping matches that removed all whitespace from the begining of *all* blank lines when normalizing whitespace. Once I got that, I could simplfy the EmptyBlockProcessor and easily output one or two blank lines appropriately. A blank block gets two new lines (`'\n\n'`), while a block which starts with a newline gets one.
* Remove RSS Extension.Waylan Limberg2013-02-121-114/+0
| | | | | | Closes #143. If you would like to continue using the extension (not recomended), it is archived on [Github](https://gist.github.com/waylan/4773365).
* Allow capitalized Admonition title.Waylan Limberg2013-02-121-1/+1
| | | | | If an adminition title is capitalized, the html class on the div should still be lowercased.
* Merge branch 'master' into admonitionTiago Serafim2013-02-0915-68/+141
|\ | | | | | | | | | | Conflicts: docs/extensions/index.txt tests/extensions/test.cfg
| * Footnote ids contain dashes when outputing HTML5.Waylan Limberg2013-02-082-6/+8
| | | | | | | | | | Previously they contained colons - and they still do for HTML4 and XHTML. Fixes #180.
| * Updated docs to reflect extension loading best practices.Waylan Limberg2013-02-081-5/+0
| | | | | | | | Fixes #184. Also delted some commented out code I missed in previous commit.
| * Moved whitespace normalization to a preprocessor.Waylan Limberg2013-02-083-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #150 - at least as much as I'm willing to. This allows whitespace normalization to be overridable by the extension API. Yes, I realize that most other processors will also proabably need to be overniriden to work with any differant whitespace normalization - but I'm okay with that. As pointed out in #150, some processors have the tab length hardcoded in regexes. I'm willing to accept a working patch that fixes that - and keeps the regexes easy to override in a subclass (the provded patch moved them inside the __init__ method - which is not so easy to override in a subclass)). However, that is about the only additional change I'm willing to consider for this issue.
| * Cleaned up fixes for #183Waylan Limberg2013-02-083-1/+7
| | | | | | | | | | | | | | | | | | My previous commit (d5a94c2) broke a few things badly. Unfortunately I failed to run the complete test suite and didn't catch it. A bad regex was crashing the test suite. Also cleaned up a few other odds and ends from previous work on #183. Still loosing a few random empty lines in code blocks though. I suspect this may also fix #188.
| * HtmlBlockProcessor preserves empty linesWaylan Limberg2013-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Partial fix for #183. This has the same effect on empty lines in code blocks as not using the html processor at all (which was eating some of the missing newlines as reported in issue #183). By doing `rsplit('\n\n')` the third newline (in each set of three) always ends up at the end of a block, rather than the begining - which it less of an issue for the html processor. Also updated tests to indicate final intended output, although they do not fully pass yet.
| * Preserve whitespace in empty linesWaylan Limberg2013-02-071-1/+0
| | | | | | | | | | | | | | | | Partial fix for #183. By preserving tabs at the start of empty lines in code blocks, the parser will retain those empty lines. Still does not work consistantly if the tab is missing!? Not sure why. Also added tests.
| * Preserve empty lines in code blocksWaylan Limberg2013-02-062-7/+8
| | | | | | | | | | | | Partial fix for #183. Some lines are still being lost. When the processors are run, one line is lost. When their calling code is comments out (completely skiped) a line is still lost if more than 3 exist in a row. Also need to add some tests for this.
| * nl2br and attr_list compatability.Waylan Limberg2013-02-062-3/+3
| | | | | | | | | | | | Fixes #177. When using both extensions, breaks (`<br>`) must have a linebreak (`\n`) after them before attr_list is run. This patch reorders the treeprocessors so that happens ('attr_list' runs after 'prettify' not before). Also had to alter headerid extension so it runs after 'prettify' or it would run before 'attr_list' if loaded before 'attr_list' by user.
| * Account for a paragraph that starts with a colon when processing def_listsWaylan Limberg2013-02-061-4/+10
| | | | | | | | Fixes #171. While that report provided an example of an unordered list item that started with a colon, any block that starts with a colon and has no siblings before it (paragraph as begining if document, list item, etc) all exhibit this same behavior. Following PHP Markdown Extra's lead, these are not definition items as they have no term before them.
| * Whitelisted known safe url schemes in safe_mode. A better fix for #185.Waylan Limberg2013-02-061-6/+7
| |
| * Forbid javascript:// URLs in safe modePhilipp Hagemeister2013-02-051-0/+3
| |
| * Enable attributes inside image referencesAdam Backstrom2013-01-271-0/+4
| |
| * Better fix for #164. Works in Python 2 & 3.Waylan Limberg2012-12-181-4/+4
| |
| * Fixed #165. Switched the order of treeprocessors when attr_list and headerid ↵Waylan Limberg2012-12-132-10/+8
| | | | | | | | extensions are used togeather. While this means headerid may alter IDs defined in attr_lists for uniqueness, automaticaly generated ids will not contain unparsed attr_lists. This is the lesser of two evils - and actually generates a more valid output (all IDs will be unique)
| * Fixed #164. attr_list extension attribute names are now sanitized and won't ↵Waylan Limberg2012-12-131-2/+13
| | | | | | | | crash the serealizer.
| * Upped version to 2.3.dev.Waylan Limberg2012-12-052-3/+29
| | | | | | | | | | Also refactored the version info to force PEP 386 compliance and to avoid the need to change the version in both the source and setup.py
| * Fixed #160. No `markdown=1` support in safe_mode.Waylan Limberg2012-12-051-2/+3
| | | | | | | | | | | | | | When in safe_mode, there is no raw html to contain `markdown=1` for processing, so there is no need to turn on that feature. The symptom reported in issue #160 appears to be a side effect of commit a2377e1129331430998de821ed3abf38247edca1.
| * Merge pull request #159 from mitya57/masterWaylan Limberg2012-11-099-11/+3
| |\ | | | | | | Fixed pyflakes warnings
| | * Fix all pyflakes unused-import/unused-variable warningsDmitry Shachnev2012-11-099-11/+3
| | |
| * | Updated fix for #158 for Python <2.7Waylan Limberg2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Apparently, the `errors` keyword to encode was added in Python 2.7. In previous versions, it was just a positional argument. This should now work in all support versions. Thanks to @Gamma3000 for assistance in working through this issue.
| * | Fixed #158. Now properly encoding output to stdout.Waylan Limberg2012-11-071-8/+7
| |/ | | | | | | | | | | | | | | This is another try at this problem. The trick is geting code that works with both Python 2 and Python 3. I think this does it. The only improvment I can see now is to catch any errors and customize the error message to sugg that the user set the environment variable PYTHONIOENCODING to the desired encoding before calling the commandline script.
| * Merge branch 'master' of https://github.com/waylan/Python-Markdown2.2.1.finalWaylan Limberg2012-11-042-3/+20
| |\
| | * Remove exec bit from extensions/fenced_code.pyDmitry Shachnev2012-11-031-0/+0
| | |
| | * Fix silly typo in previous commit.Waylan Limberg2012-11-011-1/+1
| | |
| | * A better fix for #155. Unescaping inline placholders now returns the text ↵Waylan Limberg2012-11-011-6/+19
| | | | | | | | | | | | only of an Element - rather than the html which just gets html escaped in the output anyway.
| | * Fixed #154. Inline placeholders in img alt text are now unescaped.Waylan Limberg2012-11-011-1/+1
| | |
| | * Fixed #155. Early unescaping of inline placeholders now works when the ↵Waylan Limberg2012-11-011-1/+5
| | | | | | | | | | | | placeholder is an Elementtree Element.
| * | Upped version to 2.2.1.Waylan Limberg2012-11-041-2/+2
| |/
| * Fixed #153. Two spaces at end of paragraph is not a linebreak.Waylan Limberg2012-10-211-2/+0
| |
| * Fixed #152. Spaces in links are now escaped.Waylan Limberg2012-10-211-0/+1
| |
| * Fixed #151. Raw html matching is now case-insensitive.Waylan Limberg2012-10-211-1/+1
| |