From 2ab04421a346c9367528b17cb840927b2f35056c Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Wed, 17 Dec 2008 23:42:28 -0600
Subject: [PATCH] BlahTeX/PNG Support (from Ari Stern)

---
 app/views/admin/edit_web.rhtml      |  4 ++--
 app/views/markdownPNG_help.html.erb | 16 ++++++++++++++++
 public/stylesheets/instiki.css      |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 app/views/markdownPNG_help.html.erb

diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml
index b4277cd0..0fc270aa 100644
--- a/app/views/admin/edit_web.rhtml
+++ b/app/views/admin/edit_web.rhtml
@@ -25,8 +25,8 @@
   <div class="inputBox">
     <label for="markup">Markup:</label>
     <select id="markup" name="markup">
-      <%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Markdown+itex2MML' => :markdownMML, 'Mixed' => :mixed, 
-              'RDoc' => :rdoc }, @web.markup) %>
+      <%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Markdown+itex2MML' => :markdownMML, 'Markdown+blahtex/PNG' => :markdownPNG, 
+              'Mixed' => :mixed, 'RDoc' => :rdoc }, @web.markup) %>
     </select>
 
     &#xa0;&#xa0;
diff --git a/app/views/markdownPNG_help.html.erb b/app/views/markdownPNG_help.html.erb
new file mode 100644
index 00000000..89d44a5d
--- /dev/null
+++ b/app/views/markdownPNG_help.html.erb
@@ -0,0 +1,16 @@
+<h3>Markdown+blahtex/PNG formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">basics</a>, <a target="_new" href="http://maruku.rubyforge.org/#extra">extended syntax</a>, <a target="_new" href="http://maruku.rubyforge.org/proposal.html">metadata</a>)</h3>
+<table cellspacing="0" cellpadding="0">
+  <tr><td>_your text_</td><td class="arrow">&#x2192;</td><td><em>your text</em></td></tr>
+  <tr><td>**your text**</td><td class="arrow">&#x2192;</td><td><strong>your text</strong></td></tr>
+  <tr><td>`my code`</td><td class="arrow">&#x2192;</td><td><code>my code</code></td></tr>
+  <tr><td>$LaTeX code$</td><td class="arrow">&#x2192;</td><td>Insert an inline <br /> math expression</td></tr>
+  <tr><td>\[LaTeX code\]</td><td class="arrow">&#x2192;</td><td>Insert a math <br /> expression on <br /> its own line</td></tr>
+  <tr><td>* Bulleted list<br />* Second item</td><td class="arrow">&#x2192;</td><td>&#8226; Bulleted list<br />&#8226; Second item</td></tr>
+  <tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">&#x2192;</td><td>1. Numbered list<br />2. Second item</td></tr>
+  <tr><td>Definition list<br />: is useful</td><td class="arrow">&#x2192;</td><td><dl style="display:inline"><dt>Definition list</dt><dd>is useful</dd></dl></td></tr>
+  <tr><td>[link name](URL)</td><td class="arrow">&#x2192;</td><td><a href="URL">link name</a></td></tr>
+  <tr><td>![Alt text](URL)</td><td class="arrow">&#x2192;</td><td>Image</td></tr>
+  <tr><td>## Header ##<br />### Subheader ###<br />#### Etc. ####</td><td class="arrow">&#x2192;</td><td><b><span style="font-size:1.2em">Header</span><br /><span style="font-size:1.1em">Subheader</span><br /><span style="font-size:1em">Etc.</span></b></td></tr>
+  <tr><td>***</td><td class="arrow">&#x2192;</td><td>Horizontal ruler</td></tr>
+  <tr><td>&lt;http://url><br />&lt;email@add.com></td><td class="arrow">&#x2192;</td><td>Auto-linked</td></tr>
+</table>
diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
index a8f64665..a3508610 100644
--- a/public/stylesheets/instiki.css
+++ b/public/stylesheets/instiki.css
@@ -379,6 +379,7 @@ merror {display:inline;font-size:1em;}
 math[display=block] {overflow:auto;}
 math { white-space: nowrap }
 .maruku-eq-number {float:right}
+.maruku-equation {text-align:center}
 .blockquotesource {margin-left:1em;}
 fieldset.search {display:inline; border:none;padding:0;margin:0;top:5px;position:relative;}
 span.keyboard {