elements.
+ *
+ * ---------------------------------------------------------------------
+ *
+ * Copyright (c) 2010 Design Science, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+(function (MML) {
+
+ MML.ms.Augment({
+ toHTML: function (span) {
+ span = this.HTMLhandleSize(this.HTMLcreateSpan(span));
+ var values = this.getValues("lquote","rquote");
+ var text = this.data.join(""); // FIXME: handle mglyph?
+ var pattern = [];
+ if (values.lquote.length === 1) {pattern.push(this.HTMLquoteRegExp(values.lquote))}
+ if (values.rquote.length === 1) {pattern.push(this.HTMLquoteRegExp(values.rquote))}
+ if (pattern.length) {text = text.replace(RegExp("("+pattern.join("|")+")","g"),"\\$1")}
+ this.HTMLhandleVariant(span,this.HTMLgetVariant(),values.lquote+text+values.rquote);
+ this.HTMLhandleSpace(span);
+ this.HTMLhandleColor(span);
+ },
+ HTMLquoteRegExp: function (string) {
+ return string.replace(/([.*+?|{}()\[\]\\])/g,"\\$1");
+ }
+ });
+ MML.ms.prototype.defaults.fontfamily = 'monospace';
+
+ MathJax.Hub.Startup.signal.Post("HTML-CSS ms Ready");
+
+})(MathJax.ElementJax.mml);
+
+MathJax.Ajax.loadComplete(MathJax.OutputJax["HTML-CSS"].autoloadDir+"/ms.js");
diff --git a/lib/gollum/frontend/public/javascript/MathJax/jax/output/HTML-CSS/blank.gif b/lib/gollum/frontend/public/javascript/MathJax/jax/output/HTML-CSS/blank.gif
new file mode 100644
index 00000000..8b27096e
Binary files /dev/null and b/lib/gollum/frontend/public/javascript/MathJax/jax/output/HTML-CSS/blank.gif differ
diff --git a/lib/gollum/frontend/public/javascript/MathJax/jax/output/HTML-CSS/config.js b/lib/gollum/frontend/public/javascript/MathJax/jax/output/HTML-CSS/config.js
new file mode 100644
index 00000000..2292c36f
--- /dev/null
+++ b/lib/gollum/frontend/public/javascript/MathJax/jax/output/HTML-CSS/config.js
@@ -0,0 +1,127 @@
+/*************************************************************
+ *
+ * MathJax/jax/output/HTML-CSS/config.js
+ *
+ * Initializes the HTML-CCS OutputJax (the main definition is in
+ * MathJax/jax/input/HTML-CSS/jax.js, which is loaded when needed).
+ *
+ * ---------------------------------------------------------------------
+ *
+ * Copyright (c) 2009 Design Science, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+MathJax.OutputJax["HTML-CSS"] = MathJax.OutputJax({
+ name: "HTML-CSS",
+ version: 1.0,
+ directory: MathJax.OutputJax.directory + "/HTML-CSS",
+ extensionDir: MathJax.OutputJax.extensionDir + "/HTML-CSS",
+ autoloadDir: MathJax.OutputJax.directory + "/HTML-CSS/autoload",
+ fontDir: MathJax.OutputJax.directory + "/HTML-CSS/fonts", // font name added later
+ webfontDir: MathJax.OutputJax.fontDir + "/HTML-CSS", // font name added later
+
+ config: {
+ scale: 100,
+ availableFonts: ["STIX","TeX"],
+ preferredFont: "TeX",
+ webFont: "TeX",
+ imageFont: "TeX",
+
+ styles: {
+ ".MathJax_Display": {
+ "text-align": "center",
+ margin: "1em 0em"
+ },
+
+ ".MathJax .merror": {
+ "background-color": "#FFFF88",
+ color: "#CC0000",
+ border: "1px solid #CC0000",
+ padding: "1px 3px",
+ "font-family": "serif",
+ "font-style": "italic",
+ "font-size": "90%"
+ },
+
+ ".MathJax_Preview": {color: "#888888"}
+ }
+
+ }
+});
+MathJax.OutputJax["HTML-CSS"].Register("jax/mml");
+
+(function (HUB,HTMLCSS) {
+ var CONFIG;
+ CONFIG = HUB.Insert({
+
+ //
+ // The minimum versions that HTML-CSS supports
+ //
+ minBrowserVersion: {
+ Firefox: 3.0,
+ Opera: 9.52,
+ MSIE: 6.0,
+ Chrome: 0.3,
+ Safari: 2.0,
+ Konqueror: 4.0
+ },
+
+ //
+ // For unsupported browsers, put back these delimiters for the preview
+ //
+ inlineMathDelimiters: ['$','$'], // or ["",""] or ["\\(","\\)"]
+ displayMathDelimiters: ['$$','$$'], // or ["",""] or ["\\[","\\]"]
+ //
+ // For displayed math, insert MathJax Test Page
+
+
+
+
Warning: MathJax
+requires JavaScript to process the mathematics on this page.
+
+
+
+
+MathJax Test Page
+
+If you see typeset mathematics below, then MathJax is working. If you see
+TeX code instead, MathJax is not working for you.
+
+
+
+
+
+
+MathJax is not working!
+
+
+
+If the mathematics does not show up properly, you may not have not
+installed the MathJax web fonts correctly. Follow the instructions in the
+README file .
+
+
+The MathJax-webfonts archive is available from the MathJax SourceForge
+project . Unpack the archive in the MathJax directory; you should
+obtain a fonts directory, with a hierarchy of:
+
+ MathJax/
+ fonts/
+ HTML-CSS/
+ TeX/
+ eot/
+ ...
+ imagedata.js
+ png/
+ ...
+ otf/
+ ...
+ svg/
+ ...
+
+
+
+
+
+
diff --git a/lib/gollum/frontend/public/javascript/MathJax/test/index.html b/lib/gollum/frontend/public/javascript/MathJax/test/index.html
new file mode 100644
index 00000000..400d74c1
--- /dev/null
+++ b/lib/gollum/frontend/public/javascript/MathJax/test/index.html
@@ -0,0 +1,127 @@
+
+
+
+MathJax Test Page
+
+
+
+
Warning: MathJax
+requires JavaScript to process the mathematics on this page.
+
+
+
+
+
+
+MathJax Test Page
+
+If you see typeset mathematics below, then MathJax is working. If you see
+TeX code instead, MathJax is not working for you.
+
+
+
+
+
+
+MathJax is not working!
+
+
+
+
+
WARNING : Your MathJax web fonts seem to be version
1
+rather than version 2. Be sure you have downloaded and installed the latest
+MathJax-webfonts ZIP file from
+
+
+http://sourceforge.net/projects/mathjax/files/
+
+before continuing. Failure to install the new versions of the fonts will
+mean that the data MathJax is using will not match the fonts, and so
+display errors will occur. You can probably see this in the equation
+above: the radial will be out of place.
+
+
+
+
+Once you have MathJax working properly, view the image mode test page to make sure that the
+image fallback mode is working as well.
+
+
+
+
+
diff --git a/lib/gollum/frontend/public/javascript/MathJax/test/sample.html b/lib/gollum/frontend/public/javascript/MathJax/test/sample.html
new file mode 100644
index 00000000..53a5d3a7
--- /dev/null
+++ b/lib/gollum/frontend/public/javascript/MathJax/test/sample.html
@@ -0,0 +1,99 @@
+
+
+
+MathJax Test Page
+
+
+
+
Warning: MathJax
+requires JavaScript to process the mathematics on this page.
+
+
+
+
+The Lorenz Equations
+
+
+\begin{align}
+\dot{x} & = \sigma(y-x) \\
+\dot{y} & = \rho x - y - xz \\
+\dot{z} & = -\beta z + xy
+\end{align}
+
+
+The Cauchy-Schwarz Inequality
+
+\[
+\left( \sum_{k=1}^n a_k b_k \right)^{\!\!2} \leq
+ \left( \sum_{k=1}^n a_k^2 \right) \left( \sum_{k=1}^n b_k^2 \right)
+\]
+
+A Cross Product Formula
+
+\[
+ \mathbf{V}_1 \times \mathbf{V}_2 =
+ \begin{vmatrix}
+ \mathbf{i} & \mathbf{j} & \mathbf{k} \\
+ \frac{\partial X}{\partial u} & \frac{\partial Y}{\partial u} & 0 \\
+ \frac{\partial X}{\partial v} & \frac{\partial Y}{\partial v} & 0 \\
+ \end{vmatrix}
+\]
+
+The probability of getting \(k\) heads when flipping \(n\) coins is:
+
+\[P(E) = {n \choose k} p^k (1-p)^{ n-k} \]
+
+An Identity of Ramanujan
+
+\[
+ \frac{1}{(\sqrt{\phi \sqrt{5}}-\phi) e^{\frac25 \pi}} =
+ 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}}
+ {1+\frac{e^{-8\pi}} {1+\ldots} } } }
+\]
+
+A Rogers-Ramanujan Identity
+
+\[
+ 1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots =
+ \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})},
+ \quad\quad \text{for $|q|<1$}.
+\]
+
+Maxwell's Equations
+
+
+\begin{align}
+ \nabla \times \vec{\mathbf{B}} -\, \frac1c\, \frac{\partial\vec{\mathbf{E}}}{\partial t} & = \frac{4\pi}{c}\vec{\mathbf{j}} \\
+ \nabla \cdot \vec{\mathbf{E}} & = 4 \pi \rho \\
+ \nabla \times \vec{\mathbf{E}}\, +\, \frac1c\, \frac{\partial\vec{\mathbf{B}}}{\partial t} & = \vec{\mathbf{0}} \\
+ \nabla \cdot \vec{\mathbf{B}} & = 0
+\end{align}
+
+
+Finally, while display equations look good for a page of samples, the
+ability to mix math and text in a paragraph is also important. This
+expression \(\sqrt{3x-1}+(1+x)^2\) is an example of an inline equation. As
+you see, MathJax equations can be used this way as well, without unduly
+disturbing the spacing between lines.
+
+
+
+
+
+
diff --git a/lib/gollum/frontend/templates/editbar.mustache b/lib/gollum/frontend/templates/editbar.mustache
index 308d50ea..95cd5460 100644
--- a/lib/gollum/frontend/templates/editbar.mustache
+++ b/lib/gollum/frontend/templates/editbar.mustache
@@ -26,6 +26,7 @@
Code
Formatting
Lists
+ Math
@@ -1156,6 +1157,29 @@ if he were in seventh heaven.
+
+
+
+
+
+
+
+ Description
+ What you type
+ What you get
+
+
+ Block
+ \[ \left( \sum_{k=1}^n a_k b_k \right)^2 \]
+
+ Inline
+ Consider \( x^2 + y^2 \). Consider .
+
+
+
<\/p>/, '')
data
end
+ #########################################################################
+ #
+ # TeX
+ #
+ #########################################################################
+
+ # Extract all TeX into the texmap and replace with placeholders.
+ #
+ # data - The raw String data.
+ #
+ # Returns the placeholder'd String data.
+ def extract_tex(data)
+ data.gsub(/\\\[\s*(.*?)\s*\\\]/m) do
+ id = Digest::SHA1.hexdigest($1)
+ @texmap[id] = [:block, $1]
+ id
+ end.gsub(/\\\(\s*(.*?)\s*\\\)/m) do
+ id = Digest::SHA1.hexdigest($1)
+ @texmap[id] = [:inline, $1]
+ id
+ end
+ end
+
+ # Process all TeX from the texmap and replace the placeholders with the
+ # final markup.
+ #
+ # data - The String data (with placeholders).
+ #
+ # Returns the marked up String data.
+ def process_tex(data)
+ @texmap.each do |id, spec|
+ type, tex = *spec
+ out =
+ case type
+ when :block
+ %{}
+ when :inline
+ %{}
+ end
+ data.gsub!(id, out)
+ end
+ data
+ end
+
#########################################################################
#
# Tags
diff --git a/test/test_markup.rb b/test/test_markup.rb
index 2e833efa..c6c5d50c 100644
--- a/test/test_markup.rb
+++ b/test/test_markup.rb
@@ -291,6 +291,18 @@ context "Markup" do
compare(content, output, 'org')
end
+ test "tex block syntax" do
+ content = 'a \[ a^2 \] b'
+ output = "
a b
"
+ compare(content, output, 'md')
+ end
+
+ test "tex inline syntax" do
+ content = 'a \( a^2 \) b'
+ output = "a b
"
+ compare(content, output, 'md')
+ end
+
def compare(content, output, ext = "md", regexes = [])
index = @wiki.repo.index
index.add("Bilbo-Baggins.#{ext}", content)