git.iko.soy/typeable/pandoc
on master help sign in
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.

commit58d60b1c85888697acec1edf54d166a864320717 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 20 Jun 2016, 10:35 (10 years ago) parentf04b26d
4 files changed+5−15
compare with master
unifiedsplit
README+1−1 pandoc.hs+1−1 src/Text/Pandoc/Options.hs+1−1 tests/writer.html+2−12
README+1−1
@@ -708,7 +708,7 @@ Options affecting specific writers
708708 `none` leaves `mailto:` links as they are. `javascript` obfuscates
709709 them using javascript. `references` obfuscates them by printing their
710710 letters as decimal or hexadecimal character references. The default
711− is `javascript`.
711+ is `none`.
712712
713713`--id-prefix=`*STRING*
714714
pandoc.hs+1−1
@@ -263,7 +263,7 @@ defaultOpts = Opt
263263 , optWrapText = WrapAuto
264264 , optColumns = 72
265265 , optFilters = []
266− , optEmailObfuscation = JavascriptObfuscation
266+ , optEmailObfuscation = NoObfuscation
267267 , optIdentifierPrefix = ""
268268 , optIndentedCodeClasses = []
269269 , optDataDir = Nothing
src/Text/Pandoc/Options.hs+1−1
@@ -399,7 +399,7 @@ instance Default WriterOptions where
399399 , writerDpi = 96
400400 , writerWrapText = WrapAuto
401401 , writerColumns = 72
402− , writerEmailObfuscation = JavascriptObfuscation
402+ , writerEmailObfuscation = NoObfuscation
403403 , writerIdentifierPrefix = ""
404404 , writerSourceURL = Nothing
405405 , writerUserDataDir = Nothing
tests/writer.html+2−12
@@ -478,12 +478,7 @@ Blah
478478<p><a href="/url/" title="title with &quot;quotes&quot; in it">URL and title</a></p>
479479<p><a href="/url/" title="title with single quotes">URL and title</a></p>
480480<p><a href="/url/with_underscore">with_underscore</a></p>
481−<p><script type="text/javascript">
482−<!--
483−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;
484−document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+'&#x45;&#x6d;&#x61;&#x69;&#108;&#32;&#108;&#x69;&#110;&#x6b;'+'<\/'+'a'+'>');
485−// -->
486−</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>
481+<p><a href="mailto:nobody@nowhere.net">Email link</a></p>
487482<p><a href="">Empty</a>.</p>
488483<h2 id="reference">Reference</h2>
489484<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
510505<li><a href="http://example.com/" class="uri">http://example.com/</a></li>
511506<li>It should.</li>
512507</ul>
513−<p>An e-mail address: <script type="text/javascript">
514−<!--
515−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;
516−document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'" clas'+'s="em' + 'ail">'+e+'<\/'+'a'+'>');
517−// -->
518−</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>
508+<p>An e-mail address: <a href="mailto:nobody@nowhere.net">nobody@nowhere.net</a></p>
519509<blockquote>
520510<p>Blockquoted: <a href="http://example.com/" class="uri">http://example.com/</a></p>
521511</blockquote>