diff options
| -rw-r--r-- | CHANGE_LOG.txt | 20 | ||||
| -rw-r--r-- | MANIFEST | 8 | ||||
| -rwxr-xr-x | markdown.py | 7 | ||||
| -rwxr-xr-x | scripts/pymarkdown.py | 27 | ||||
| -rw-r--r-- | setup.py | 1 |
5 files changed, 60 insertions, 3 deletions
diff --git a/CHANGE_LOG.txt b/CHANGE_LOG.txt index e076fb2..200d5b7 100644 --- a/CHANGE_LOG.txt +++ b/CHANGE_LOG.txt @@ -1,6 +1,26 @@ PYTHON MARKDOWN CHANGELOG ========================= +August 2008: Updated included extensions to ElementTree. Added a +seperate commanline script. (v2.0-alpha) + +July 2008: Switched from home-grown NanoDOM to ElementTree and +various related bugs (thanks Artem Yunusov). + +June 2008: Fixed issues with nested inline patterns and cleaned +up testing framework (thanks Artem Yunusov). + +May 2008: Added a number of additional extensions to the +distribution and other minor changes. Moved repo to git from svn. + +Mar 2008: Refactored extension api to accept either an +extension name (as a string) or an instance of an extension +(Thanks David Wolever). Fixed various bugs and added doc strings. + +Feb 2008: Various bugfixes mostly regarding extensions. + +Feb 18, 2008: Version 1.7. + Feb 13, 2008: A little code cleanup and better documentation and inheritance for pre/post proccessors. @@ -2,6 +2,14 @@ README.txt README.html CHANGE_LOG.txt markdown.py +mdx_codehilite.py +mdx_fenced_code.py mdx_footnotes.py +mdx_headerid.py +mdx_imagelinks.py +mdx_meta.py mdx_rss.py +mdx_tables.py +mdx_wikilink.py setup.py +scripts/pymarkdown.py
\ No newline at end of file diff --git a/markdown.py b/markdown.py index 8eafa31..d339965 100755 --- a/markdown.py +++ b/markdown.py @@ -2189,14 +2189,15 @@ def parse_options(): 'extensions': options.extensions, 'encoding': options.encoding } -if __name__ == '__main__': +def main(): """ Run Markdown from the command line. """ options = parse_options() - #if os.access(inFile, os.R_OK): - if not options: sys.exit(0) markdownFromFile(**options) + +if __name__ == '__main__': + main()
\ No newline at end of file diff --git a/scripts/pymarkdown.py b/scripts/pymarkdown.py new file mode 100755 index 0000000..478248e --- /dev/null +++ b/scripts/pymarkdown.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python +""" +Python-Markdown Command Line Script +=================================== + +See <http://www.freewisdom.org/projects/python-markdown/> for more +information and instructions on how to extend the functionality of the +script. + +Started by [Manfred Stienstra](http://www.dwerg.net/). Continued and +maintained by [Yuri Takhteyev](http://www.freewisdom.org) and [Waylan +Limberg](http://achinghead.com/). + +Contact: + +* <yuri@freewisdom.org> +* <waylan@gmail.com> + +License: [GPL 2](http://www.gnu.org/copyleft/gpl.html) or BSD +""" + +import markdown, sys + +if __name__ == '__main__': + """ Run Markdown from the command line. """ + + markdown.main()
\ No newline at end of file @@ -21,4 +21,5 @@ setup( "mdx_tables", "mdx_wikilink", ], + scripts = ['scripts/pymarkdown.py'], ) |