Changeset 1761 for trunk/pylucid_project/PyLucid/system/markups/creole2html.py

Timestamp:

09/11/08 11:38:30 (18 months ago)

Author:

JensDiemer

Message:

-patch the creole markup, so it don't clashes with django template tags.
-Add a unitest and merge some parts from the tinxTextile markup test.

Files:

• trunk/pylucid_project/PyLucid/system/markups/creole2html.py (modified) (2 diffs)

trunk/pylucid_project/PyLucid/system/markups/creole2html.py

@@ -184 +184 @@
 
 if __name__=="__main__":
-    #~ import sys
-    #~ document = Parser(unicode(sys.stdin.read(), 'utf-8', 'ignore')).parse()
-    #~ sys.stdout.write(HtmlEmitter(document).emit().encode('utf-8', 'ignore'))
-
     """
     http://code.google.com/p/creoleparser/source/browse/trunk/creoleparser/tests.py
@@ -194 +190 @@
     http://djikiki.googlecode.com/svn/trunk/djikiki/creole/
     """
-
-    test1 = u"""
-== Textauszeichnung
-
-Das ist **fett** und //kursiv//.
-Und noch eine Zeile...
-
-== Links
-
-Ein [[Interner Link ]] und ein normaler Link:
-[[http://domain.tld/page/| Link Text]]
-
-----
-
-Bilder mit {{Image.jpg|Ein Bild}} toll.
-
-Eine Liste:
- * eins
- * zwei
- ** drei
- ### Nummer 1
- ### Nummer 2
-
-== Tabelle
-
-  |= Item|= Size|= Price |
-  | fish | **big**  |cheap   |
-  | crab | small|expesive|
-
-  |= Item|= Size|= Price
-  | fish | big  |//cheap//
-  | crab | small|**very\\expesive**
-
-== preformatted
-
-{{{
-== [[NoWiki]]:
-//**don't** format//
-
-Good work!
-}}}"""
-
-
-    test2 = u"""= Top-level heading (1)
-== This a test for creole 0.1 (2)
-=== This is a Subheading (3)
-==== Subsub (4)
-===== Subsubsub (5)
-
-The ending equal signs should not be displayed:
-
-= Top-level heading (1) =
-== This a test for creole 0.1 (2) ==
-=== This is a Subheading (3) ===
-==== Subsub (4) ====
-===== Subsubsub (5) =====
-
-
-You can make things **bold** or //italic// or **//both//** or //**both**//.
-
-Character formatting extends across line breaks: **bold,
-this is still bold. This line deliberately does not end in star-star.
-
-Not bold. Character formatting does not cross paragraph boundaries.
-
-You can use [[internal links]] or [[http://www.wikicreole.org|external links]],
-give the link a [[internal links|different]] name.
-
-Here's another sentence: This wisdom is taken from [[Ward Cunningham's]]
-[[http://www.c2.com/doc/wikisym/WikiSym2006.pdf|Presentation at the Wikisym 06]].
-
-Here's a external link without a description: [[http://www.wikicreole.org]]
-
-Be careful that italic links are rendered properly:  //[[http://my.book.example/|My Book Title]]// 
-
-Free links without braces should be rendered as well, like http://www.wikicreole.org/ and http://www.wikicreole.org/users/~example. 
-
-Creole1.0 specifies that http://bar and ftp://bar should not render italic,
-something like foo://bar should render as italic.
-
-You can use this to draw a line to separate the page:
-----
-
-You can use lists, start it at the first column for now, please...
-
-unnumbered lists are like
-* item a
-* item b
-* **bold item c**
-
-blank space is also permitted before lists like:
-  *   item a
- * item b
-* item c
- ** item c.a
-
-or you can number them
-# [[item 1]]
-# item 2
-# // italic item 3 //
-    ## item 3.1
-  ## item 3.2
-
-up to five levels
-* 1
-** 2
-*** 3
-**** 4
-***** 5
-
-* You can have
-multiline list items
-* this is a second multiline
-list item
-
-You can use nowiki syntax if you would like do stuff like this:
-
-{{{
-Guitar Chord C:
-
-||---|---|---|
-||-0-|---|---|
-||---|---|---|
-||---|-0-|---|
-||---|---|-0-|
-||---|---|---|
-}}}
-
-Note: if you look at the source code of the above, you see the escape char (tilde, ~ )
-being used to escape the closing triple curly braces. This is to do nowiki nesting in this
-wiki which doesn't follow Creole 1.0 yet (closing triple curly braces should be indented
-by one space).
-
-You can also use it inline nowiki {{{ in a sentence }}} like this.
-
-!!! Escapes 
-Normal Link: http://wikicreole.org/ - now same link, but escaped: ~http://wikicreole.org/ 
-
-Normal asterisks: ~**not bold~**
-
-a tilde alone: ~
-
-a tilde escapes itself: ~~xxx
-
-!! Creole 0.2 
-
-This should be a flower with the ALT text "this is a flower" if your wiki supports ALT text on images:
-
-[{ImagePro src='Red-Flower.jpg' caption='here is a red flower' }]
-
-!! Creole 0.4 
-
-Tables are done like this:
-
-||header col1||header col2
-|col1|col2
-|you         |can         
-|also        |align\\ it. 
-
-You can format an address by simply forcing linebreaks:
-
-My contact dates:\\
-Pone: xyz\\
-Fax: +45\\
-Mobile: abc
-
-!! Creole 0.5 
-
-|| Header title               || Another header title     
-| {{{ //not italic text// }}} | {{{ **not bold text** }}} 
-| ''italic text''             | __  bold text __          
-
-!! Creole 1.0 
-
-If interwiki links are setup in your wiki, this links to the WikiCreole page about Creole 1.0 test cases: [WikiCreole:Creole1.0TestCases].
+    
+    txt = """
+== Headline
+
+This is **bold**...
+Wow...
+
+The current page name: >{{ PAGE.name }}< great?
+Some {% lucidTag page_update_list count=10 %} text.
+
+a [[www.google.de|Google]] link
+a ((/image.jpg|My Image)) image
+a {{/image.jpg|My Image}} image
+
+no image: {{ foo|bar }}!
+A picture [[http://google.com | {{ campfire.JPG | campfire.jpg }} ]] as a link.
 
 """
 
-    document = Parser(test2).parse()
+    document = Parser(txt).parse()
     print HtmlEmitter(document).emit()
-
-