1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
Description: use online LaTeXMathML.js by default
Author: Jonas Smedegaard <dr@jones.dk>
Last-Update: 2013-12-29
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -790,8 +790,11 @@
, Option "m" ["latexmathml", "asciimathml"]
(OptArg
- (\arg opt ->
- return opt { optHTMLMathMethod = LaTeXMathML arg })
+ (\arg opt -> do
+ let url' = case arg of
+ Just u -> u
+ Nothing -> "http://math.etsu.edu/LaTeXMathML/LaTeXMathML.js"
+ return opt { optHTMLMathMethod = LaTeXMathML url'})
"URL")
"" -- "Use LaTeXMathML script in html output"
@@ -1225,9 +1228,6 @@
else throwIO e)
variables' <- case mathMethod of
- LaTeXMathML Nothing -> do
- s <- readDataFileUTF8 datadir "LaTeXMathML.js"
- return $ ("mathml-script", s) : variables
MathML Nothing -> do
s <- readDataFileUTF8 datadir "MathMLinHTML.js"
return $ ("mathml-script", s) : variables
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
@@ -290,7 +290,7 @@
data EPUBVersion = EPUB2 | EPUB3 deriving (Eq, Show, Read, Data, Typeable, Generic)
data HTMLMathMethod = PlainMath
- | LaTeXMathML (Maybe String) -- url of LaTeXMathML.js
+ | LaTeXMathML String -- url of LaTeXMathML.js
| JsMath (Maybe String) -- url of jsMath load script
| GladTeX
| WebTeX String -- url of TeX->image script.
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -142,7 +142,7 @@
let thebody = blocks' >> footnoteSection opts notes
let math = if stMath st
then case writerHTMLMathMethod opts of
- LaTeXMathML (Just url) ->
+ LaTeXMathML url ->
H.script ! A.src (toValue url)
! A.type_ "text/javascript"
$ mempty
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -1016,14 +1016,10 @@
.SS Math rendering in HTML
.TP
.B \f[C]\-m\f[] [\f[I]URL\f[]], \f[C]\-\-latexmathml\f[][\f[C]=\f[]\f[I]URL\f[]]
-Use the LaTeXMathML script to display embedded TeX math in HTML output.
-To insert a link to a local copy of the \f[C]LaTeXMathML.js\f[] script,
-provide a \f[I]URL\f[].
-If no \f[I]URL\f[] is provided, the contents of the script will be
-inserted directly into the HTML header, preserving portability at the
-price of efficiency.
-If you plan to use math on several pages, it is much better to link to a
-copy of the script, so it can be cached.
+Use LaTeXMathML to display embedded TeX math in HTML output.
+The \f[I]URL\f[] should point to the \f[C]LaTeXMathML.js\f[] load script.
+If a \f[I]URL\f[] is not provided, a link to LaTeXMathML.js at the
+Homepage of LaTeXMathML will be inserted.
.RS
.RE
.TP
|
