diff options
author | John MacFarlane <jgm@berkeley.edu> | 2014-07-19 17:18:35 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2014-07-19 17:18:35 -0700 |
commit | a7b64532f54725ebc20f066295307389b8b4cbe0 (patch) | |
tree | 83ace6cd007e1e891b3010f6b836350c0d90eadc /src/Text/Pandoc/Readers/TeXMath.hs | |
parent | 999b952a212af0e33183068ff4a55edc5aafde62 (diff) | |
parent | e7d8039969fd177da91b871f3bc4b73950cc7bc8 (diff) | |
download | pandoc-a7b64532f54725ebc20f066295307389b8b4cbe0.tar.gz |
Merge pull request #1438 from mpickering/master
Renamed readTeXMath' to avoid name conflict with texmath 0.6.7
Diffstat (limited to 'src/Text/Pandoc/Readers/TeXMath.hs')
-rw-r--r-- | src/Text/Pandoc/Readers/TeXMath.hs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/Text/Pandoc/Readers/TeXMath.hs b/src/Text/Pandoc/Readers/TeXMath.hs index f03eae044..d7f982fb7 100644 --- a/src/Text/Pandoc/Readers/TeXMath.hs +++ b/src/Text/Pandoc/Readers/TeXMath.hs @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Conversion of TeX math to a list of 'Pandoc' inline elements. -} -module Text.Pandoc.Readers.TeXMath ( readTeXMath, readTeXMath' ) where +module Text.Pandoc.Readers.TeXMath ( texMathToInlines ) where import Text.Pandoc.Definition import Text.TeXMath @@ -35,22 +35,13 @@ import Text.TeXMath -- | Converts a raw TeX math formula to a list of 'Pandoc' inlines. -- Defaults to raw formula between @$@ or @$$@ characters if entire formula -- can't be converted. -readTeXMath' :: MathType +texMathToInlines :: MathType -> String -- ^ String to parse (assumes @'\n'@ line endings) -> [Inline] -readTeXMath' mt inp = case texMathToPandoc dt inp of +texMathToInlines mt inp = case texMathToPandoc dt inp of Left _ -> [Str (delim ++ inp ++ delim)] Right res -> res where (dt, delim) = case mt of DisplayMath -> (DisplayBlock, "$$") InlineMath -> (DisplayInline, "$") -{-# DEPRECATED readTeXMath "Use readTeXMath' from Text.Pandoc.JSON instead" #-} --- | Converts a raw TeX math formula to a list of 'Pandoc' inlines. --- Defaults to raw formula between @$@ characters if entire formula --- can't be converted. (This is provided for backwards compatibility; --- it is better to use @readTeXMath'@, which properly distinguishes --- between display and inline math.) -readTeXMath :: String -- ^ String to parse (assumes @'\n'@ line endings) - -> [Inline] -readTeXMath = readTeXMath' InlineMath |