Changes to literate haskell options.

- Removed writerLiterateHaskell from WriterOptions.
- Removed readerLiterateHaskell from ReaderOptions.
- Added Ext_literate_haskell to Extensions.  Test for this
  instead of the above.
- Removed failUnlessLHS from Shared.

Note:  At this point, +lhs and .lhs extension no longer has any effect.
Need to fix.

3 files changed, 4 insertions, 4 deletions

diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 8d6c71746..4a5a14d6a 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -187,7 +187,7 @@ inline = (mempty <$ comment)
      <|> (mathInline  $ char '$' *> mathChars <* char '$')
      <|> (superscript <$> (char '^' *> tok))
      <|> (subscript <$> (char '_' *> tok))
-     <|> (failUnlessLHS *> char '|' *> doLHSverb)
+     <|> (guardEnabled Ext_literate_haskell *> char '|' *> doLHSverb)
      <|> (str <$> count 1 tildeEscape)
      <|> (str <$> string "]")
      <|> (str <$> string "#") -- TODO print warning?
@@ -737,7 +737,7 @@ environments = M.fromList
   , ("itemize", bulletList <$> listenv "itemize" (many item))
   , ("description", definitionList <$> listenv "description" (many descItem))
   , ("enumerate", ordered_list)
-  , ("code", failUnlessLHS *>
+  , ("code", guardEnabled Ext_literate_haskell *>
       (codeBlockWith ("",["sourceCode","literate","haskell"],[]) <$>
         verbEnv "code"))
   , ("verbatim", codeBlock <$> (verbEnv "verbatim"))
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index e21646446..0205e4603 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -422,7 +422,7 @@ codeBlockIndented = do
 
 lhsCodeBlock :: Parser [Char] ParserState (F Blocks)
 lhsCodeBlock = do
-  failUnlessLHS
+  guardEnabled Ext_literate_haskell
   (return . B.codeBlockWith ("",["sourceCode","literate","haskell"],[]) <$>
           (lhsCodeBlockBird <|> lhsCodeBlockLaTeX))
     <|> (return . B.codeBlockWith ("",["sourceCode","haskell"],[]) <$>
diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index 6bbb2fbd2..9fb976903 100644
--- a/src/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
@@ -407,7 +407,7 @@ mathBlockMultiline = try $ do
 
 lhsCodeBlock :: Parser [Char] ParserState Block
 lhsCodeBlock = try $ do
-  getOption readerLiterateHaskell >>= guard
+  guardEnabled Ext_literate_haskell
   optional codeBlockStart
   pos <- getPosition
   when (sourceColumn pos /= 1) $ fail "Not in first column"