Squashed 'cgilite/' changes from 898d470..9b019ee

9b019ee simpler reex for matching email links (again, for portability )

git-subtree-dir: cgilite
git-subtree-split: 9b019ee3d845d1edac5a6a33ebf385b120f136f8

diff --git a/markdown.awk b/markdown.awk
index 6e1440cbd44fc8b4aa895455a30a5d0998246456..ad8c438a8c66321ee30c532b97fbdf5049fd09ef 100755 (executable)
--- a/markdown.awk
+++ b/markdown.awk
@@ -175,7 +175,7 @@ function inline( line, LOCAL, len, text, code, href, guard, ret ) {
 
     # quick link email
     # } else if ( match( line, /^<[a-zA-Z0-9.!#$%&'\''*+\/=?^_`{|}~-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*>/ ) ) {
-    } else if ( match( line, /^<[a-zA-Z0-9.!#$%&'\''*+\/=?^_`{|}~-]+@[a-zA-Z0-9]([a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9-]?[a-zA-Z0-9])?)*>/ ) ) {
+    } else if ( match( line, /^<[a-zA-Z0-9.!#$%&'\''*+\/=?^_`{|}~-]+@([a-zA-Z0-9]\.[a-zA-Z0-9]|[a-zA-Z0-9-])+>/ ) ) {
       len = RLENGTH;
       href = HTML( substr( line, 2, len - 2) );
       ret = ret "<a href=\"mailto:" href "\">" href "</a>"; line = substr( line, len + 1);

diff --git a/tests-markdown.sh b/tests-markdown.sh
index 2bbcf5dfa40645bc71ede3626c3c552dee304444..a834391f07bdb66b444d988676c3febfbc7813b1 100755 (executable)
--- a/tests-markdown.sh
+++ b/tests-markdown.sh
@@ -80,6 +80,9 @@ assert '<https://de.wikipedia.org>' "<p><a href=\"https://de.wikipedia.org\">htt
 assert '<http://de.wikipedia.org>' "<p><a href=\"http://de.wikipedia.org\">http://de.wikipedia.org</a></p>" "automatic link"
 # assert '<//de.wikipedia.org>' "<p><a href=\"//de.wikipedia.org\">http://de.wikipedia.org</a></p>" "automatic link"
 
+assert '<hello&goodbye@sub-test.example.com>' "<p><a href=\"mailto:hello&amp;goodbye@sub-test.example.com\">hello&amp;goodbye@sub-test.example.com</a></p>" "automatic link, email"
+# assert '<hällö&guttbei@sub-test.example.com>' "<p><a href=\"mailto:hällö&amp;guttbei@sub-test.example.com\">hällö&amp;guttbei@sub-test.example.com</a></p>" "automatic link, email"
+
 # Inline Links
 assert '[Wikipedia](http://de.wikipedia.org)' "<p><a href=\"http://de.wikipedia.org\">Wikipedia</a></p>" "inline link"
 assert '[Wikipedia](http://de.wikipedia.org "Online Encyclopedia")' "<p><a href=\"http://de.wikipedia.org\" title=\"Online Encyclopedia\">Wikipedia</a></p>" "inline link"