From 58d60b1c85888697acec1edf54d166a864320717 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 20 Jun 2016 10:35:14 -0700 Subject: 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. --- README | 2 +- pandoc.hs | 2 +- src/Text/Pandoc/Options.hs | 2 +- tests/writer.html | 14 ++------------ 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

URL and title

URL and title

with_underscore

-

+

Email link

Empty.

Reference

Foo bar.

@@ -510,12 +505,7 @@ document.write(''+'
  • http://example.com/
  • It should.
    • -

    An e-mail address:

    +

    An e-mail address: nobody@nowhere.net

    Blockquoted: http://example.com/

    -- cgit v1.2.3