[Blends-commit] [SCM] website branch, master, updated. 8f58caa67a06c12c5405cc56bb32911c62be4bd1

[Ole Streicher]

The following commit has been merged in the master branch:
commit 8f58caa67a06c12c5405cc56bb32911c62be4bd1
Author: Ole Streicher <ole at aip.de>
Date:   Thu May 12 15:34:04 2016 -0300

    Disable the special handling of URLs in the descriptions.
    This is already handled in markdown itself, and the disabled lines
    produce wrong results if the line already contains markdown conform code,
    like `line = '... [Scisoft](http://www.eso.org/scisoft)'`.

diff --git a/webtools/blendsmarkdown.py b/webtools/blendsmarkdown.py
index 4710daf..b637162 100644
--- a/webtools/blendsmarkdown.py
+++ b/webtools/blendsmarkdown.py
@@ -62,11 +62,14 @@ def PrepareMarkdownInput(lines):
         # otherwise
         if line.startswith('#'):
             ret += '\\'
-        if detect_url_re.search(line):
-            # some descriptions put URLs in '<>' which is unneeded and might
-            # confuse the parsing of '&' in URLs which is needed sometimes
-            line = re.sub('<*([fh]t?tp://[-./\w?=~;&%]+)>*',
-                          '[\\1](\\1)', line)
+# The following is already handled by markdown itself, but confuses the
+# use of Markdown in the description, like for
+# line = '... [Scisoft](http://www.eso.org/scisoft)'
+#        if detect_url_re.search(line):
+#            # some descriptions put URLs in '<>' which is unneeded and might
+#            # confuse the parsing of '&' in URLs which is needed sometimes
+#            line = re.sub('<*([fh]t?tp://[-./\w?=~;&%]+)>*',
+#                          '[\\1](\\1)', line)
         ret += line + "\n"
     return ret
 

-- 
Static and dynamic websites for Debian Pure Blends