Merge branch 'master' into docbookreader

2 files changed, 5 insertions, 5 deletions

diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index 59cb31e66..3ec94af9d 100644
--- a/src/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
@@ -152,7 +152,7 @@ noteToMarkdown opts num blocks = do
 -- | Escape special characters for Markdown.
 escapeString :: String -> String
 escapeString = escapeStringUsing markdownEscapes
-  where markdownEscapes = backslashEscapes "\\`*_>#~^"
+  where markdownEscapes = backslashEscapes "\\`*_$<>#~^"
 
 -- | Construct table of contents from list of header blocks.
 tableOfContents :: WriterOptions -> [Block] -> Doc 
diff --git a/tests/writer.markdown b/tests/writer.markdown
index 364954e00..14fc3a434 100644
--- a/tests/writer.markdown
+++ b/tests/writer.markdown
@@ -528,10 +528,10 @@ LaTeX
 These shouldn’t be math:
 
 -   To get the famous equation, write `$e = mc^2$`.
--   $22,000 is a *lot* of money. So is $34,000. (It worked if “lot” is
+-   \$22,000 is a *lot* of money. So is \$34,000. (It worked if “lot” is
     emphasized.)
--   Shoes ($20) and socks ($5).
--   Escaped `$`: $73 *this should be emphasized* 23$.
+-   Shoes (\$20) and socks (\$5).
+-   Escaped `$`: \$73 *this should be emphasized* 23\$.
 
 Here’s a LaTeX table:
 
@@ -560,7 +560,7 @@ AT&T is another way to write it.
 
 This & that.
 
-4 < 5.
+4 \< 5.
 
 6 \> 5.