diff --git a/VERSION b/VERSION index e637d7c0..ce2359c5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.09.06.15.17.26 +Version 2.6.0-development+timestamp.2013.09.06.15.34.34 diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index 76f4520a..750d170f 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -745,8 +745,8 @@ def render(text, >>> render("----\\nhello world\\n----\\n") '
hello world' - >>> render('[[http://example.com]]') - '
' + >>> render('[[myanchor]]') + '
' >>> render('[[ http://example.com]]') '' @@ -1369,7 +1369,7 @@ def render(text, def expand_meta(m): code,b,p,s = segments.pop(0) if code==None or m.group() == DISABLED_META: - return escape(s) + return escape(s) if b in extra: if code[:1]=='\n': code=code[1:] if code[-1:]=='\n': code=code[:-1] @@ -1379,8 +1379,8 @@ def render(text, return str(extra[b](code)) elif b=='cite': return '['+','.join('%s' \ - % (d,b,d) \ - for d in escape(code).split(','))+']' + % (id_prefix+d,b,d) \ + for d in escape(code).split(','))+']' elif b=='latex': return LATEX % code.replace('"','\"').replace('\n',' ') elif b in html_colors: