From 26eaedf47879594c2bbf3856dfa23196e1d6b5d3 Mon Sep 17 00:00:00 2001 From: Massimo DiPierro Date: Fri, 23 Mar 2012 18:48:44 -0500 Subject: [PATCH] to in markmin --- VERSION | 2 +- gluon/contrib/markmin/markmin2html.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 77ddc7e4..9e88a60e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-03-21 07:11:29) dev +Version 1.99.7 (2012-03-23 18:48:40) dev diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index abe846a6..b6c44231 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -259,7 +259,7 @@ regex_maps = [ (re.compile('[ \t\r]+\n'),'\n'), (re.compile('[ \t\r]+\n'),'\n'), (re.compile('\*\*(?P[^\s\*]+( +[^\s\*]+)*)\*\*'),'\g'), - (re.compile("''(?P[^\s']+( +[^\s']+)*)''"),'\g'), + (re.compile("''(?P[^\s']+( +[^\s']+)*)''"),'\g'), (re.compile('^#{6} (?P[^\n]+)',re.M),'\n\n<
\g
\n'), (re.compile('^#{5} (?P[^\n]+)',re.M),'\n\n<
\g
\n'), (re.compile('^#{4} (?P[^\n]+)',re.M),'\n\n<

\g

\n'), @@ -317,7 +317,7 @@ def render(text,extra={},allowed={},sep='p'): >>> render('``\\nhello\\nworld\\n``:python') '
hello\\nworld
' >>> render("''hello world''") - '

hello world

' + '

hello world

' >>> render('** hello** **world**') '

** hello** world

'