Consolidated 'text', 'special', and 'inline' into 'inline'.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@577 788f1e2b-df1e-0410-8736-df70ead52e1b

1 files changed, 23 insertions, 8 deletions

diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 4ac5bad80..8bf9ecead 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -710,14 +710,29 @@ table = do
 -- inline
 --
 
-text = choice [ escapedChar, math, strong, emph, smartPunctuation,
-                code, ltSign, symbol,
-                str, linebreak, tabchar, whitespace, endline ] <?> "text"
-
-inline = choice [ rawLaTeXInline', escapedChar, entity, special, text ] <?> "inline"
-
-special = choice [ noteRef, inlineNote, link, referenceLink, rawHtmlInline', 
-                   autoLink, image ] <?> "link, inline html, note, or image"
+inline = choice [ rawLaTeXInline'
+                , escapedChar
+                , entity
+                , noteRef
+                , inlineNote
+                , link
+                , referenceLink
+                , rawHtmlInline'
+                , autoLink
+                , image
+                , escapedChar
+                , math
+                , strong
+                , emph
+                , smartPunctuation
+                , code
+                , ltSign
+                , symbol
+                , str
+                , linebreak
+                , tabchar
+                , whitespace
+                , endline ] <?> "inline"
 
 escapedChar = try $ do
   char '\\'