From 50ba5a801a2593598f1484c7ce4aa941f00ed0b0 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Tue, 11 Jun 2013 10:16:54 -0700
Subject: Textile reader:  Correctly handle entities.

---
 src/Text/Pandoc/Readers/Textile.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/Text/Pandoc/Readers')

diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs
index 8d259482d..22ec52362 100644
--- a/src/Text/Pandoc/Readers/Textile.hs
+++ b/src/Text/Pandoc/Readers/Textile.hs
@@ -374,6 +374,7 @@ inlineParsers = [ str
                 , link
                 , image
                 , mark
+                , (Str . (:[])) <$> characterReference
                 , smartPunctuation inline
                 , symbol
                 ]
@@ -424,7 +425,7 @@ note = try $ do
 
 -- | Special chars
 markupChars :: [Char]
-markupChars = "\\*#_@~-+^|%=[]"
+markupChars = "\\*#_@~-+^|%=[]&"
 
 -- | Break strings on following chars. Space tab and newline break for
 --  inlines breaking. Open paren breaks for mark. Quote, dash and dot
-- 
cgit v1.2.3