Changed definition of 'enclosed' in Text.Pandoc.Shared so that

'try' is not automatically applied to the 'end' parser.
Added 'try' in calls to 'enclosed' where needed.  Slight speed
increase.


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

src/Text/Pandoc/Readers/LaTeX.hs

@@ -551,7 +551,7 @@ singleQuoteEnd = try $ char '\'' >> notFollowedBy alphaNum
 
 doubleQuoteStart = string "``"
 
-doubleQuoteEnd = string "''"
+doubleQuoteEnd = try $ string "''"
 
 ellipses = try $ string "\\ldots" >> optional (try (string "{}")) >>
                  return Ellipses

src/Text/Pandoc/Readers/Markdown.hs

@@ -684,11 +684,11 @@ emph = ((enclosed (char '*') (char '*') inline) <|>
         (enclosed (char '_') (char '_') inline)) >>= 
         return . Emph . normalizeSpaces
 
-strong = ((enclosed (string "**") (string "**") inline) <|> 
-          (enclosed (string "__") (string "__") inline)) >>=
+strong = ((enclosed (string "**") (try $ string "**") inline) <|> 
+          (enclosed (string "__") (try $ string "__") inline)) >>=
          return . Strong . normalizeSpaces
 
-strikeout = failIfStrict >> enclosed (string "~~") (string "~~") inline >>=
+strikeout = failIfStrict >> enclosed (string "~~") (try $ string "~~") inline >>=
             return . Strikeout . normalizeSpaces
 
 superscript = failIfStrict >> enclosed (char '^') (char '^') 

src/Text/Pandoc/Readers/RST.hs

@@ -514,7 +514,7 @@ code = try $ do
 emph = enclosed (char '*') (char '*') inline >>= 
        return . Emph . normalizeSpaces
 
-strong = enclosed (string "**") (string "**") inline >>= 
+strong = enclosed (string "**") (try $ string "**") inline >>= 
          return . Strong . normalizeSpaces
 
 interpreted role = try $ do

src/Text/Pandoc/Shared.hs

@@ -287,8 +287,8 @@ enclosed :: GenParser Char st t   -- ^ start parser
 	    -> GenParser Char st a    -- ^ content parser (to be used repeatedly)
 	    -> GenParser Char st [a]
 enclosed start end parser = try $ 
-  start >> notFollowedBy space >> many1Till parser (try end)
-                                                     
+  start >> notFollowedBy space >> many1Till parser end
+
 -- | Parse string, case insensitive.
 stringAnyCase :: [Char] -> CharParser st String
 stringAnyCase [] = string ""