aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Writers/Docx.hs
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-07-19 17:18:35 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-07-19 17:18:35 -0700
commita7b64532f54725ebc20f066295307389b8b4cbe0 (patch)
tree83ace6cd007e1e891b3010f6b836350c0d90eadc /src/Text/Pandoc/Writers/Docx.hs
parent999b952a212af0e33183068ff4a55edc5aafde62 (diff)
parente7d8039969fd177da91b871f3bc4b73950cc7bc8 (diff)
downloadpandoc-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/Writers/Docx.hs')
-rw-r--r--src/Text/Pandoc/Writers/Docx.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 4b787b023..de31e462e 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -756,7 +756,7 @@ inlineToOpenXML opts (Math mathType str) = do
else DisplayInline
case texMathToOMML displayType str of
Right r -> return [r]
- Left _ -> inlinesToOpenXML opts (readTeXMath' mathType str)
+ Left _ -> inlinesToOpenXML opts (texMathToInlines mathType str)
inlineToOpenXML opts (Cite _ lst) = inlinesToOpenXML opts lst
inlineToOpenXML opts (Code attrs str) =
withTextProp (rStyle "VerbatimChar")