From cb4ae6112e4bf9b12b3131fa96fc8d29b1e77dec Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 16 Aug 2014 17:14:51 -0700
Subject: Markdown writer: don't escape $, ^, ~ when extensions are
 deactivated.

`tex_math_dollars`, `superscript`, and `subscript` extensions,
respectively.

Closes #1127.
---
 src/Text/Pandoc/Writers/Markdown.hs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/Text/Pandoc/Writers/Markdown.hs')

diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index 95d4db29b..f06f1d6cc 100644
--- a/src/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
@@ -241,9 +241,20 @@ noteToMarkdown opts num blocks = do
               else marker <> spacer <> contents
 
 -- | Escape special characters for Markdown.
-escapeString :: String -> String
-escapeString = escapeStringUsing markdownEscapes
-  where markdownEscapes = backslashEscapes "\\`*_$<>#~^"
+escapeString :: WriterOptions -> String -> String
+escapeString opts = escapeStringUsing markdownEscapes
+  where markdownEscapes = backslashEscapes specialChars
+        specialChars =
+                (if isEnabled Ext_superscript opts
+                    then ('^':)
+                    else id) .
+                (if isEnabled Ext_subscript opts
+                    then ('~':)
+                    else id) .
+                (if isEnabled Ext_tex_math_dollars opts
+                    then ('$':)
+                    else id) $
+                "\\`*_<>#"
 
 -- | Construct table of contents from list of header blocks.
 tableOfContents :: WriterOptions -> [Block] -> Doc
@@ -742,11 +753,11 @@ inlineToMarkdown opts (Code attr str) = do
   if plain
      then return $ text str
      else return $ text (marker ++ spacer ++ str ++ spacer ++ marker) <> attrs
-inlineToMarkdown _ (Str str) = do
+inlineToMarkdown opts (Str str) = do
   st <- get
   if stPlain st
      then return $ text str
-     else return $ text $ escapeString str
+     else return $ text $ escapeString opts str
 inlineToMarkdown opts (Math InlineMath str)
   | isEnabled Ext_tex_math_dollars opts =
       return $ "$" <> text str <> "$"
-- 
cgit v1.2.3