Changed email-obfuscation default to no obfuscation.

- `writerEmailObfuscation` in `defaultWriterOptions` is now
  `NoObfuscation`
- the default for the command-line `--email-obfuscation` option is
  now `none`.

Closes #2988.

4 files changed, 5 insertions, 15 deletions

diff --git a/README b/README
index d41188873..8d0fa5f2b 100644
--- a/README
+++ b/README
@@ -708,7 +708,7 @@ Options affecting specific writers
     `none` leaves `mailto:` links as they are.  `javascript` obfuscates
     them using javascript. `references` obfuscates them by printing their
     letters as decimal or hexadecimal character references.  The default
-    is `javascript`.
+    is `none`.
 
 `--id-prefix=`*STRING*
 
diff --git a/pandoc.hs b/pandoc.hs
index cb3d1e04a..70e24378a 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -263,7 +263,7 @@ defaultOpts = Opt
     , optWrapText              = WrapAuto
     , optColumns               = 72
     , optFilters               = []
-    , optEmailObfuscation      = JavascriptObfuscation
+    , optEmailObfuscation      = NoObfuscation
     , optIdentifierPrefix      = ""
     , optIndentedCodeClasses   = []
     , optDataDir               = Nothing
diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs
index 701cd8bd1..4f73cd99e 100644
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
@@ -399,7 +399,7 @@ instance Default WriterOptions where
                       , writerDpi              = 96
                       , writerWrapText         = WrapAuto
                       , writerColumns          = 72
-                      , writerEmailObfuscation = JavascriptObfuscation
+                      , writerEmailObfuscation = NoObfuscation
                       , writerIdentifierPrefix = ""
                       , writerSourceURL        = Nothing
                       , writerUserDataDir      = Nothing
diff --git a/tests/writer.html b/tests/writer.html
index 4a60a7b97..3b63f4e16 100644
--- a/tests/writer.html
+++ b/tests/writer.html
@@ -478,12 +478,7 @@ Blah
 <p><a href="/url/" title="title with &quot;quotes&quot; in it">URL and title</a></p>
 <p><a href="/url/" title="title with single quotes">URL and title</a></p>
 <p><a href="/url/with_underscore">with_underscore</a></p>
-<p><script type="text/javascript">
-<!--
-h='&#110;&#x6f;&#x77;&#104;&#x65;&#114;&#x65;&#46;&#110;&#x65;&#116;';a='&#64;';n='&#110;&#x6f;&#98;&#x6f;&#100;&#x79;';e=n+a+h;
-document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+'&#x45;&#x6d;&#x61;&#x69;&#108;&#32;&#108;&#x69;&#110;&#x6b;'+'<\/'+'a'+'>');
-// -->
-</script><noscript>&#x45;&#x6d;&#x61;&#x69;&#108;&#32;&#108;&#x69;&#110;&#x6b;&#32;&#40;&#110;&#x6f;&#98;&#x6f;&#100;&#x79;&#32;&#x61;&#116;&#32;&#110;&#x6f;&#x77;&#104;&#x65;&#114;&#x65;&#32;&#100;&#x6f;&#116;&#32;&#110;&#x65;&#116;&#x29;</noscript></p>
+<p><a href="mailto:nobody@nowhere.net">Email link</a></p>
 <p><a href="">Empty</a>.</p>
 <h2 id="reference">Reference</h2>
 <p>Foo <a href="/url/">bar</a>.</p>
@@ -510,12 +505,7 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+'&#x4
 <li><a href="http://example.com/" class="uri">http://example.com/</a></li>
 <li>It should.</li>
 </ul>
-<p>An e-mail address: <script type="text/javascript">
-<!--
-h='&#110;&#x6f;&#x77;&#104;&#x65;&#114;&#x65;&#46;&#110;&#x65;&#116;';a='&#64;';n='&#110;&#x6f;&#98;&#x6f;&#100;&#x79;';e=n+a+h;
-document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+e+'<\/'+'a'+'>');
-// -->
-</script><noscript>&#110;&#x6f;&#98;&#x6f;&#100;&#x79;&#32;&#x61;&#116;&#32;&#110;&#x6f;&#x77;&#104;&#x65;&#114;&#x65;&#32;&#100;&#x6f;&#116;&#32;&#110;&#x65;&#116;</noscript></p>
+<p>An e-mail address: <a href="mailto:nobody@nowhere.net">nobody@nowhere.net</a></p>
 <blockquote>
 <p>Blockquoted: <a href="http://example.com/" class="uri">http://example.com/</a></p>
 </blockquote>