diff options
author | JensDiemer <git@jensdiemer.de> | 2011-08-05 22:29:18 +0200 |
---|---|---|
committer | JensDiemer <git@jensdiemer.de> | 2011-08-05 22:29:18 +0200 |
commit | 24d59a350d67f3dd8e4a87af9dea42da4f1530b7 (patch) | |
tree | 8aeecaa3de5746cba16a424b9af0de6c69f96b57 | |
parent | a8eebbc518317b1839fdfb855d2a7ce2b888d5a0 (diff) | |
download | creole-24d59a350d67f3dd8e4a87af9dea42da4f1530b7.tar.gz |
Update demo.py
-rw-r--r-- | README.creole | 3 | ||||
-rw-r--r-- | creole/__init__.py | 2 | ||||
-rw-r--r-- | demo.py | 39 |
3 files changed, 25 insertions, 19 deletions
diff --git a/README.creole b/README.creole index 5a3bf17..87d70c0 100644 --- a/README.creole +++ b/README.creole @@ -91,6 +91,9 @@ Contributers should take a look at this page: = history +* v0.7.2 +** Activate {{{----}}} to {{{<hr>}}} in html2rest +** Update demo.py * v0.7.1 ** Bugfix if docutils are not installed ** API change: rest2html is now here: {{{ from creole.rest2html.clean_writer import rest2html }}} diff --git a/creole/__init__.py b/creole/__init__.py index 9f13a98..976a4f6 100644 --- a/creole/__init__.py +++ b/creole/__init__.py @@ -19,7 +19,7 @@ """ -__version__ = (0, 7, 1) +__version__ = (0, 7, 2) __api__ = (1, 0) # Creole 1.0 spec - http://wikicreole.org/ @@ -8,40 +8,43 @@ """ -from creole import creole2html, html2creole +from creole import creole2html, html2creole, html2rest, html2textile -source = u"""\ +source_creole = u"""\ == simple demo + You can convert from: -* from //creole// to **html** -* from **html** back to //creole// +* **creole2html**, **html2creole**, **html2rest**, //html2textile// + +=== a table: -=== e.g. a table: |=headline 1 |= headline 2 | | 1.1. cell | 1.2. cell | | 2.1. cell | 2.2. cell | + ---- More info on our [[http://code.google.com/p/python-creole/|Homepage]].""" -if __name__ == "__main__": - print "*" * 79 - print " Source creole markup text:" - print "-" * 79 - print source - - print "*" * 79 - print " Convert it into html:" - print "-" * 79 - html = creole2html(source) +if __name__ == "__main__": + print "_" * 79 + "\n*** Convert creole into html: ***\n\n" + html = creole2html(source_creole) print html - print "*" * 79 - print " Convert the html code back into creole:" - print "-" * 79 + print "\n\n" + "_" * 79 + "\n*** Convert html back into creole: ***\n\n" creole = html2creole(html) print creole + + + print "\n\n" + "_" * 79 + "\n*** Convert html into ReStructuredText: ***\n\n" + rest = html2rest(html) + print rest + + + print "\n\n" + "_" * 79 + "\n*** Convert html into textile: ***\n\n" + textile = html2textile(html) + print textile |