From 7f5496d1bb5c292b5cf9c068d039531dba168820 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Thu, 1 Mar 2012 11:19:03 -0600 Subject: [PATCH] fixed issues 686, markming rendering of consecutive tables and blockquotes, thanks mirek.zvolsky --- VERSION | 2 +- gluon/contrib/markmin/markmin2html.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index d501bb92..9b155826 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.4 (2012-03-01 11:01:59) stable +Version 1.99.4 (2012-03-01 11:18:51) stable diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index 8a9f7c99..2d614cf0 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -396,9 +396,9 @@ def render(text,extra={},allowed={},sep='p'): content = item.group('t') if ' | ' in content: rows = content.replace('\n','').replace(' | ','') - text = text[:item.start()] + '<
'%c + rows + '
' + text[item.end():] + text = text[:item.start()] + '<
'%c + rows + '
\n' + text[item.end():] else: - text = text[:item.start()] + '<
'%c + content + '
' + text[item.end():] + text = text[:item.start()] + '<
'%c + content + '
\n' + text[item.end():] ############################################################# # deal with images, videos, audios and links