diff --git a/VERSION b/VERSION index 0fe90388..7a813579 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.10.27.23.22.02 +Version 2.7.4-stable+timestamp.2013.10.30.08.58.58 diff --git a/applications/examples/views/default/index.html b/applications/examples/views/default/index.html index f99d2ca4..2bfec2a6 100644 --- a/applications/examples/views/default/index.html +++ b/applications/examples/views/default/index.html @@ -42,7 +42,7 @@ random.shuffle(quotes)

Download Now
- Online Demo
+ Try it now online
Sites Powered by web2py
diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index 750d170f..fc7e3396 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -4,6 +4,7 @@ # recreated by Vladyslav Kozlovskyy # license MIT/BSD/GPL import re +import urllib from cgi import escape from string import maketrans try: @@ -466,7 +467,7 @@ You can use Google charts to render the formula: `` LATEX = '' -markmin2html(text,{'latex':lambda code: LATEX % code.replace('"','\\\\"')}) +markmin2html(text,{'latex':lambda code: LATEX % urllib.quote(code)}) `` ### Code with syntax highlighting @@ -779,7 +780,7 @@ def render(text, 'xaaax' >>> print render(r"$$\int_a^b sin(x)dx$$") - + >>> markmin2html(r"use backslash: \[\[[[mess\[[ag\]]e link]]\]]") '

use backslash: [[mess[[ag]]e]]

' @@ -1382,7 +1383,7 @@ def render(text, % (id_prefix+d,b,d) \ for d in escape(code).split(','))+']' elif b=='latex': - return LATEX % code.replace('"','\"').replace('\n',' ') + return LATEX % urllib.quote(code) elif b in html_colors: return '%s' \ % (b, render(code, {}, {}, 'br', URL, environment, latex,