3 files changed, 11 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs
index 2e8b56124..1ded83ff1 100644
--- a/src/Text/Pandoc/Readers/HTML.hs
+++ b/src/Text/Pandoc/Readers/HTML.hs
@@ -57,7 +57,7 @@ import Control.Applicative ( (<$>), (<$), (<*), (*>), (<|>))
 import Data.Monoid (mconcat, Monoid, mempty, (<>), First (..))
 import Text.Printf (printf)
 import Debug.Trace (trace)
-import Text.TeXMath (readMathML, writeTeXMath)
+import Text.TeXMath (readMathML, writeTeX)
 import Data.Default (Default (..), def)
 import Control.Monad.Reader (Reader,ask, asks, local, runReader)
 
@@ -572,7 +572,7 @@ pRawHtmlInline = do
      else return mempty
 
 mathMLToTeXMath :: String -> Either String String
-mathMLToTeXMath s = writeTeXMath <$> readMathML s
+mathMLToTeXMath s = writeTeX <$> readMathML s
 
 pMath :: Bool -> TagParser Inlines
 pMath inCase = try $ do
diff --git a/src/Text/Pandoc/Readers/Org.hs b/src/Text/Pandoc/Readers/Org.hs
index 34e98380e..065f5a046 100644
--- a/src/Text/Pandoc/Readers/Org.hs
+++ b/src/Text/Pandoc/Readers/Org.hs
@@ -41,7 +41,7 @@ import           Text.Pandoc.Parsing hiding ( F, unF, askF, asksF, runF
                                             )
 import           Text.Pandoc.Readers.LaTeX (inlineCommand, rawLaTeXInline)
 import           Text.Pandoc.Shared (compactify', compactify'DL)
-import           Text.TeXMath (texMathToPandoc, DisplayType(..))
+import           Text.TeXMath (readTeX, writePandoc, DisplayType(..))
 
 import           Control.Applicative ( Applicative, pure
                                      , (<$>), (<$), (<*>), (<*), (*>) )
@@ -1383,7 +1383,7 @@ inlineLaTeX = try $ do
   maybe mzero returnF $ parseAsMath cmd `mplus` parseAsInlineLaTeX cmd
  where
    parseAsMath :: String -> Maybe Inlines
-   parseAsMath cs = maybeRight $ B.fromList <$> texMathToPandoc DisplayInline cs
+   parseAsMath cs = B.fromList <$> texMathToPandoc cs
 
    parseAsInlineLaTeX :: String -> Maybe Inlines
    parseAsInlineLaTeX cs = maybeRight $ runParser inlineCommand state "" cs
@@ -1391,6 +1391,9 @@ inlineLaTeX = try $ do
    state :: ParserState
    state = def{ stateOptions = def{ readerParseRaw = True }}
 
+   texMathToPandoc inp = (maybeRight $ readTeX inp) >>=
+                         writePandoc DisplayInline
+
 maybeRight :: Either a b -> Maybe b
 maybeRight = either (const Nothing) Just
 
diff --git a/src/Text/Pandoc/Readers/TeXMath.hs b/src/Text/Pandoc/Readers/TeXMath.hs
index d7f982fb7..3fee3051e 100644
--- a/src/Text/Pandoc/Readers/TeXMath.hs
+++ b/src/Text/Pandoc/Readers/TeXMath.hs
@@ -38,9 +38,10 @@ import Text.TeXMath
 texMathToInlines :: MathType
              -> String    -- ^ String to parse (assumes @'\n'@ line endings)
              -> [Inline]
-texMathToInlines mt inp = case texMathToPandoc dt inp of
-                           Left _    -> [Str (delim ++ inp ++ delim)]
-                           Right res -> res
+texMathToInlines mt inp =
+  case writePandoc dt `fmap` readTeX inp of
+       Right (Just ils)  -> ils
+       _                 -> [Str (delim ++ inp ++ delim)]
     where (dt, delim) = case mt of
                              DisplayMath -> (DisplayBlock, "$$")
                              InlineMath  -> (DisplayInline, "$")