aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@gitorious.org:python-markdown/mainlineWaylan Limberg2010-08-204-12/+26
|\
| * Fixed ticket 69. Corrected a few syntax incompatabilities between python 2.x ↵Waylan Limberg2010-08-031-3/+4
| | | | | | | | and 3.x in the setup script. Now the script actually can run 2to3 automaticaly when run under Python 3.x. Thanks for the report Virgil Dupras.
| * Fixed problem hidden by Ticket 68. Defining a footnote placeholder in a ↵Waylan Limberg2010-08-023-8/+22
| | | | | | | | markdown document results in the placeholder actually being replaced. Also added a test for this. Note that if the placeholder paragraph has other text, that text is lost. Not sure if this is a bug or bad markdown syntax.
| * Fix Ticket 68. Remove an old line of code from the footnote extension that ↵Waylan Limberg2010-08-021-1/+0
| | | | | | | | should have been removed excatly 2 years and 3 days ago (commit bd185087dc899b6157f8) when elementtree support was added. And to think it has been generating an error the whole time and was only just reported now. It appears this was never tested as it still does not work after removing the old line. At least we do not get an error. The footnote placeholder is just an empty paragraph. Thanks for the report Evan Carmi.
* | Added a build_docs command to setup script. This command only builds ↵Waylan Limberg2010-08-201-1/+57
|/ | | | (converts text files to html) in the build dir. It does not install them on the system.
* Added logging imports to markdown.extensions which were missed in recent ↵Waylan Limberg2010-07-222-0/+77
| | | | reorg. Also added tests to make sure erros and warnings are raised where they should be.
* Fixed Ticket 65. Lines with only a lessthan sign (<) no longer crash the ↵Waylan Limberg2010-07-143-3/+16
| | | | raw html parser. Fixed a related but I found while debugging this as well. Also added tests for both.
* Missed changing version_info earlier.Waylan Limberg2010-07-141-1/+1
|
* The 2to3 tool now gets run automaticaly when building in Python 3.x.Waylan Limberg2010-07-141-1/+10
|
* Made some changes to setup.py. Markdown version is now set to 2.1.0.Dev as ↵Waylan Limberg2010-07-142-4/+4
| | | | it should have been for some time now. Also updated classifiers to correctly represent the Python versions we support. Removed 2.3 and added 2.7.
* Fixed Ticket 66. We have dropped official support for Python 3.0 and now ↵Waylan Limberg2010-07-142-5/+8
| | | | only officially support Python 3.1+ in the Python 3 series (we still support 2.4, 2.5 & 2.6 in the Python 2 series). If you really must use Python 3.0, we suggest using Python 3.1's 2to3 tool. See comment in source and Ticket 66 for more.
* Updated docs for recent changes to options accepted by the Markdown class ↵Waylan Limberg2010-07-122-33/+49
| | | | and the import paths of various things used by extensions.
* Cleaned up the comments in markdown/__init__.py after the refactor.Waylan Limberg2010-07-071-33/+14
|
* Fixed tab_length on codehilite extension to match new implementation of ↵Waylan Limberg2010-07-071-11/+5
| | | | default configs.
* A better implementation of globals as attributes on the Markdown class. This ↵Waylan Limberg2010-07-076-52/+53
| | | | should be more future proof.
* Factored out the building of the various processors and patterns into ↵Waylan Limberg2010-07-076-103/+90
| | | | utility functions called by a build_parser method on the Markdown class. Editing of the processors and patterns now all happen in one file for each type. Additionaly, a subclass of Markdown could potentially override the build_parser method and build a parser for a completely differant markup language without first building the default and then overriding it.
* Moved a bunch of global variables to the instance of the Markdown class.Waylan Limberg2010-07-067-40/+48
|
* Removed Global variable HTML_PLACEHOLDER. Use HtmlStash.get_placeholder(key) ↵Waylan Limberg2010-07-063-9/+7
| | | | if you need it.
* Moved base Extension class and extension loaders to ↵Waylan Limberg2010-07-062-100/+100
| | | | markdown/extensions/__init__.py. Now only the Markdown class and two public wrappers are in markdown/__init__.py.
* Moved HtmlStash and base Prosessor classes to the new util module.Waylan Limberg2010-07-065-58/+53
|
* Updated commandline script as logging settings are no longer in ↵Waylan Limberg2010-07-063-4/+5
| | | | markdown/__init__.py
* More cleanup. I thought I removed this.Waylan Limberg2010-07-061-36/+0
|
* Cleanup of my cleanup.Waylan Limberg2010-07-062-37/+1
|
* Clean up previous commit a little. renamed misc_logging to md_logging and ↵Waylan Limberg2010-07-067-14/+90
| | | | fixed imports. We import logging levels from logging directly and only import message from md_logging.
* Rename misc.py to util.py at the request of upstreamToshio Kuratomi2010-07-0517-101/+101
|
* Actually commit the files with the code moved out of __init__.pyToshio Kuratomi2010-07-052-0/+109
|
* Establish backwards compatibilityToshio Kuratomi2010-07-051-0/+6
|
* Break cyclic import of markdown. This allows people to embed markdownToshio Kuratomi2010-07-0519-222/+138
| | | | if they desire.
* Fix for undefined variables that need to be importedToshio Kuratomi2010-07-054-3/+4
|
* Fixed Ticket 63. Changed name of commandline script (again) to 'markdown_py' ↵Waylan Limberg2010-07-012-4/+10
| | | | because 'markdown' conflicts with the perl implementation. 'markdown_py' will at least still work with tab completion when the user types 'markdown'.
* Moved INSTALL, LICENSE and README files out of docs dir and into root dir ↵Waylan Limberg2010-03-244-0/+3
| | | | where they should be.
* Fixed Ticket 60. The dd in definition lists can now not be indented on ↵Waylan Limberg2010-03-243-2/+19
| | | | secondary lines.
* Fixed ticket 59. Reference links now strip angle brackets from the url.Waylan Limberg2010-03-253-3/+14
|
* The html-tidy extension now fails gracefully when tidy is not installed on ↵Waylan Limberg2010-03-251-2/+6
| | | | the system -- markdown continues without it.
* Changed the default style used by pygments in the codehilite extension. ↵Waylan Limberg2010-03-252-3/+3
| | | | This was a recently added feature, but older versions of pygments don't know what the 'tango' style is, so we now use pygemnts 'default' by default. Not sure why the 'tango' style was used here in the first place. I'm guess it was the preferance of whoever contributed the patch.
* Blockquoted text in the first item of a list is now placed in child p tag of theGerry LaMontagne2010-03-233-25/+58
| | | | blockquote tag. Added lists8.txt and .html for test suite to test condition.
* Fixed ticket 58. The first item of a looselist gets placed in p tags whenGerry LaMontagne2010-03-222-5/+39
| | | | | | it has a sublist. Previously, the test suite erroneously passed this condition because there was an error in the expected '.html' output file. The expected output has been corrected as well.
* Fixed Ticket 57. Lists where the first line of an item is a nested item, now ↵Waylan Limberg2010-03-193-2/+159
| | | | observe rules for using p tags. Thanks to Gerry LaMontagne for the patch.
* Merge commit 'origin'Waylan Limberg2010-03-150-0/+0
|\
| * Fix bug with rawhtml and markdown escaping. Previously, any inline rawhtml ↵Waylan Limberg2010-03-013-1/+11
| | | | | | | | that contained text that fit markdown's escaping syntax (i.e. <x\]>) was never unescaped. Now it is. Markdown probably shouldn't be escaping before removing rawhtml in the first place, but this will do for now.
* | Fixed Ticket 53. Nested lists no longer isorder items in certain edge cases. ↵Waylan Limberg2010-03-153-1/+27
| | | | | | | | Thanks for the report and preliminary work Gerry LaMontagne.
* | Fix bug with rawhtml and markdown escaping. Previously, any inline rawhtml ↵Waylan Limberg2010-03-153-1/+11
|/ | | | that contained text that fit markdown's escaping syntax (i.e. <x\]>) was never unescaped. Now it is. Markdown probably shouldn't be escaping before removing rawhtml in the first place, but this will do for now.
* Fixed some code that wasn't Python 2.4 compatible.Waylan Limberg2010-02-221-1/+1
|
* Updated last failing test as we no longer need a demo of a failing test now ↵Waylan Limberg2010-02-221-2/+2
| | | | that the branch is merged.
* Merge branch 'tests'Waylan Limberg2010-02-22299-4638/+3112
|\
| * Changes path of html output to be written into current dir rather than a tmp ↵Waylan Limberg2010-02-222-2/+2
| | | | | | | | dir. No need to create the tmp dir on first run.
| * Added documentation for the test suite.Waylan Limberg2010-02-141-0/+131
| |
| * Added run-tests.py script and added a helpful error message if nose is not ↵Waylan Limberg2010-02-132-5/+11
| | | | | | | | installed. Note the run-tests script will be used by simply running 'nosetests' from the commandline, so the hack in 'tests/__init__.py' has been removed.
| * Merge branch 'master' into testsWaylan Limberg2010-02-131-119/+0
| |\ | |/ |/|
* | Removed imagelinks extension. It never worked without some third party code ↵Waylan Limberg2010-02-131-119/+0
| | | | | | | | that has never been shipped with Markdown anyway - and that code it not readily available. See list discussion for more info.