From 8fa0b122c753dcabbfb7da37e1a0decc29a2aac4 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Thu, 14 Jun 2012 14:28:28 -0500
Subject: [PATCH] better markin, thanks villas

---
 VERSION                               |  2 +-
 gluon/contrib/markmin/markmin2html.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/VERSION b/VERSION
index ddc9452e..55efd4ed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-14 13:00:51) dev
+Version 2.00.0 (2012-06-14 14:28:23) dev
diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py
index 86f531e5..e97f2877 100755
--- a/gluon/contrib/markmin/markmin2html.py
+++ b/gluon/contrib/markmin/markmin2html.py
@@ -277,7 +277,7 @@ regex_anchor = re.compile(r'\[\[(?P<t>\S+)\]\]')
 regex_image_center_width = re.compile(r'\[\[(?P<t>[^\]]*?) +(?P<k>\S+) +center +(?P<w>\d+px)\]\]')
 regex_image_width = re.compile(r'\[\[(?P<t>[^\]]*?) +(?P<k>\S+) +(?P<p>left|right) +(?P<w>\d+px)\]\]')
 regex_image_center = re.compile(r'\[\[(?P<t>[^\]]*?) +(?P<k>\S+) +center\]\]')
-regex_image = re.compile(r'\[\[(?P<t>[^\]]*?) +(?P<k>\S+) +(?P<p>left|right|center)\]\]')
+regex_image = re.compile(r'\[\[(?P<t>[^\]]*?) +(?P<k>\S+) +(?P<p>left|right)\]\]')
 regex_video = re.compile(r'\[\[(?P<t>[^\]]*?) +(?P<k>\S+) +video\]\]')
 regex_audio = re.compile(r'\[\[(?P<t>[^\]]*?) +(?P<k>\S+) +audio\]\]')
 regex_link = re.compile(r'\[\[(?P<t>[^\]]*?) +(?P<k>\S+)\]\]')
@@ -286,9 +286,9 @@ regex_link_no_anchor = re.compile(r'\[\[ +(?P<k>\S+)\]\]')
 regex_qr = re.compile(r'(?<!["\w>/=])qr:(?P<k>\w+://[\w.\-+?&%/:]+)',re.M)
 regex_embed = re.compile(r'(?<!["\w>/=])embed:(?P<k>\w+://[\w.\-+?&%/:]+)', re.M)
 regex_iframe = re.compile(r'(?<!["\w>/=])iframe:(?P<k>\w+://[\w.\-+?&%/:]+)', re.M)
-regex_auto_image = re.compile(r'(?<!["\w>/=])(?P<k>\w+://\S+\.(jpeg|jpg|gif|png)(\?\S+)?)',re.M)
-regex_auto_video = re.compile(r'(?<!["\w>/=])(?P<k>\w+://\S+\.(mp4|mpeg|mov)(\?\S+)?)',re.M)
-regex_auto_audio = re.compile(r'(?<!["\w>/=])(?P<k>\w+://\S+\.(mp3|wav)(\?\S+)?)',re.M)
+regex_auto_image = re.compile(r'(?<!["\w>/=])(?P<k>\w+://\S+\.(jpeg|JPEG|jpg|JPG|gif|GIF|png|PNG)(\?\S+)?)',re.M)
+regex_auto_video = re.compile(r'(?<!["\w>/=])(?P<k>\w+://\S+\.(mp4|MP4|mpeg|MPEG|mov|MOV)(\?\S+)?)',re.M)
+regex_auto_audio = re.compile(r'(?<!["\w>/=])(?P<k>\w+://\S+\.(mp3|MP3|wav|WAV)(\?\S+)?)',re.M)
 regex_auto = re.compile(r'(?<!["\w>/=])(?P<k>\w+://\S+)',re.M)
 
 def render(text,extra={},allowed={},sep='p',URL=None,environment=None,latex='google'):
@@ -422,10 +422,10 @@ def render(text,extra={},allowed={},sep='p',URL=None,environment=None,latex='goo
     #############################################################
 
     text = regex_anchor.sub('<span id="\g<t>"><span>', text)
-    text = regex_image_center_width.sub('<p align="center"><img src="\g<k>" alt="\g<t>" width="\g<w>" /></p>', text)
-    text = regex_image_width.sub('<img src="\g<k>" alt="\g<t>" align="\g<p>" width="\g<w>" />', text)
-    text = regex_image_center.sub('<p align="center"><img src="\g<k>" alt="\g<t>" /></p>', text)
-    text = regex_image.sub('<img src="\g<k>" alt="\g<t>" align="\g<p>" />', text)
+    text = regex_image_center_width.sub('<p style="text-align:center"><img src="\g<k>" alt="\g<t>" width="\g<w>" /></p>', text)
+    text = regex_image_width.sub('<img src="\g<k>" alt="\g<t>" style="float:\g<p>" width="\g<w>" />', text)
+    text = regex_image_center.sub('<p style="text-align:center"><img src="\g<k>" alt="\g<t>" /></p>', text)
+    text = regex_image.sub('<img src="\g<k>" alt="\g<t>" style="float:\g<p>" />', text)
     text = regex_video.sub('<video controls="controls"><source src="\g<k>" /></video>', text)
     text = regex_audio.sub('<audio controls="controls"><source src="\g<k>" /></audio>', text)
     text = regex_link_popup.sub('<a href="\g<k>" target="_blank">\g<t></a>', text)