aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Misc typos.chri2012-08-284-6/+6
|
* Merge pull request #131 from mitya57/masterWaylan Limberg2012-08-272-2399/+2398
|\ | | | | Fixed `footnote_many_footnotes` test
| * Merge commit '63020032eab733ed74f06a687abb5c358de4e931'Dmitry Shachnev2012-08-261-1/+0
| |\
| | * Don't import from doctest, it's no longer usedDmitry Shachnev2012-08-261-1/+0
| |/ |/|
| * Fix `footnote_many_footnotes` test as per #129Dmitry Shachnev2012-08-251-2398/+2398
|/
* Merge branch 'master' of https://github.com/waylan/Python-MarkdownWaylan Limberg2012-08-231-1/+1
|\
| * Merge pull request #130 from erikvanzijst/masterWaylan Limberg2012-08-151-1/+1
| |\ | | | | | | Fix unicode problem in headerid extension
| | * Fixed unicode breakage.Erik van Zijst2012-08-141-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slugify() requires unicode, not a str instance. This causes the extension to crash: File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/__init__.py" in markdown 386. return md.convert(text) File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/__init__.py" in convert 287. newRoot = treeprocessor.run(root) File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/extensions/headerid.py" in run 140. id = slugify(''.join(itertext(elem)), sep) File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/extensions/headerid.py" in slugify 93. value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore') TypeError: must be unicode, not str
* / Fixed encoding issues when writing to stdout.Waylan Limberg2012-08-231-2/+9
|/ | | | | | | | | | | | | | | | | In Python 2.x, if you write to stdout and stdout is piped (for example: `python -m markdown foo.txt | less`), then `sys.stdout.encoding` is `None` and an error is rasied. Commit 1132f9e20cd7a5d6be809651f1034c44c32dbc0e was an attempt to fix this, and it works in Python 2.x. However, it does not work in Python 3.x, which does not exhibit this problem. In fact, that fix actually breaks things in Python 3 whether the output is piped or not. Additionaly, in Python 2.x, the fix is not needed if the output is not being piped. As we do not have a version specific issue, but an issue with `sys.stdout.encoding`, we check for that to determine which way to go. This way, the "right thing" *should* happen every time.
* Merge branch 'master' of https://github.com/waylan/Python-MarkdownWaylan Limberg2012-08-091-11/+6
|\
| * Removed references to doctests in docs as per #114Waylan Limberg2012-07-261-11/+6
| |
* | Fixed #129. Footnotes now output valid HTML5.Waylan Limberg2012-08-094-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As HTML5 has depreciated use of `rev=anything` and `rel=footnotes`, they are no longer inlcuded in the output when the output_format is set to HTML5. Note that if someone successful registers a spec for `rel=footnotes` in the future (as a microformat), then that could be considered valid. But until that happens, it is invlaid to use in HTML5. Therefore, we remove it from the output (when outputing HTML% only). As an alternative, two new classes are set (in all output_formats). On the link to the footnote (where `rel=footnotes` was used), we set `class=footnote-ref` and on the backlink (where `rev=footnote` was used), we set `class=footnote-backref`. Also updated the tests to reflect to the new classes in the output.
* | Improved `Markdown.set_output_format()`Waylan Limberg2012-08-091-4/+10
|/ | | | | | | | | | Specificaly, `self.output_format` is defined and contains a string of the output format used on the instance. This is more useful that an instance of the searializer when determining alternate behavior elsewhere in the parser. For example, see Issue #129. Also cleaned up the error when an invalid format is provided. We now re-raise the original error (with a custom message) rather than raising a new error.
* Fixed #114. Converted doctests to unittests. While I left the doctests there ↵Waylan Limberg2012-07-262-1/+275
| | | | for documentation purposes, they are no longer being run. Perhaps I'll delete them later and add links to the online docs or something.
* Merge pull request #127 from svetlyak40wt/fix-piped-stdoutWaylan Limberg2012-07-261-1/+2
|\ | | | | Fixed UnicodeEncodeError when output from markdown_py is piped
| * Fixed UnicodeEncodeError when output from markdown_py is piped into another ↵Alexander Artemenko2012-07-261-1/+2
|/ | | | | | | program. In this case text should be encoded into the output encoding explicitly, because sys.stdout.encoding is None, when piping data.
* Merge pull request #124 from papaeye/lexer+lexerWaylan Limberg2012-07-243-1/+21
|\ | | | | Added support for <foo>+<bar> lexers of Pygments
| * Added support for <foo>+<bar> lexers of Pygmentspapaeye2012-07-213-1/+21
|/
* Merge pull request #122 from Scorpil/masterWaylan Limberg2012-07-191-1/+4
|\ | | | | More expressive ValueError description
| * Merge branch 'master' of github.com:Scorpil/Python-MarkdownScorpil2012-07-201-2/+1
| |\ | | | | | | | | | | | | Conflicts: markdown/odict.py
| | * Added more expressive description of an error.Scorpil2012-07-201-1/+5
| | |
| * | Added more expressive description of an error.Scorpil2012-07-201-1/+5
| |/
* | Merge pull request #121 from Scorpil/patch-1Waylan Limberg2012-07-181-1/+1
|\ \ | | | | | | Fixed typo in docs: 'md.treepreprocessor' for 'md.treeprocessor'.
| * | Fixed typo in docs: 'md.treepreprocessor' for 'md.treeprocessor'. Andrew2012-07-191-1/+1
| |/
* | Merge pull request #120 from apelisse/masterWaylan Limberg2012-07-181-1/+1
|\ \ | |/ |/| Fixes example after moving AtomicString to util
| * Fixes example after moving AtomicString to utilAntoine Pelisse2012-07-181-1/+1
| |
* | Merge pull request #118 from ThiefMaster/patch-1Waylan Limberg2012-07-161-1/+1
|\ \ | |/ |/| Stack Overflow does NOT convert single linebreaks in markdown to `<br>` ...
| * Stack Overflow does NOT convert single linebreaks in markdown to `<br>` tags.Adrian2012-07-161-1/+1
|/
* Fixed #115. Make sure all file objects are closed.Waylan Limberg2012-07-122-4/+10
|
* Fixed 113. We still support Python 2.5 until Markdown version 2.3.Waylan Limberg2012-07-121-1/+1
|
* Fixed #112 and cleaned up error reporting when loading extensions.Waylan Limberg2012-07-122-12/+16
|
* Upped version to 2.2.0-Final.2.2.0.finalWaylan Limberg2012-07-051-1/+1
|
* Removed beta warning from 2.2 release notes.Waylan Limberg2012-07-051-3/+1
|
* Added .md to README.md etc in MANIFEST.in.Waylan Limberg2012-07-051-3/+3
|
* Fixed #106. Replaced all references to freewisdom.org (except for Yuri's ↵Waylan Limberg2012-06-2816-43/+42
| | | | homepage).
* Fixed #110. Documented the 'fenced_code' extension's support for the ↵Waylan Limberg2012-06-281-0/+13
| | | | 'codehilite' extension.
* Fixed #109. The attr_list extension can now be loaded either before or after ↵Waylan Limberg2012-06-281-2/+6
| | | | the headerid extension.
* Fixed #105. Non-existant extensions fail with a warning only.Waylan Limberg2012-06-281-1/+1
|
* Fix #99. Account for empty header IDs when ensuring uniqueness.Waylan Limberg2012-05-241-1/+1
|
* Fixed Issue #98. The language designator must start at the beginging of the ↵Waylan Limberg2012-05-181-1/+1
| | | | first line of a code block for codehilite to recognize it.
* Merge branch 'master' of github.com:waylan/Python-MarkdownWaylan Limberg2012-05-041-4/+9
|\
| * Updated docs to reflect fix in #82.Waylan Limberg2012-05-031-4/+9
| |
* | Updated version to 2.2.0.alpha.2.2.0.alphaWaylan Limberg2012-05-042-28/+28
| |
* | Added release notes for v2.2.0.Waylan Limberg2012-05-043-17/+87
|/
* Fixed #82. 'enable_attributes' honors 'safe_mode'.Waylan Limberg2012-05-031-0/+4
| | | | | | | Note that you can still explicitly set 'enable_attributes' and that value will be honored regardless of 'safe_mode'. However if 'safe_mode' is on and 'enable_attributes' is not explicitly set, then 'enable_attributes' defaults to False.
* Merge pull request #95 from cataliniacob/masterWaylan Limberg2012-04-174-6/+14
|\ | | | | Attempted fix for issue 87
| * Add test for 5236a9838c580a17c3299efb97d9f41ce2a1efabCatalin Iacob2012-04-173-0/+7
| |
| * Fixed #87Catalin Iacob2012-04-161-6/+7
|/ | | | Elements should be inserted in the tree regardless of enable_attributes
* Merge pull request #94 from fin/masterWaylan Limberg2012-04-112-0/+2
|\ | | | | added a test for the previous pull request
| * tests for 9852c2263ef7775d2a508a9c1721148cbf3ae258fin2012-04-112-0/+2
| |