diff -r -N -X exclude.txt -u3 instiki-0.11.0/app/views/admin/edit_web.rhtml instiki-0.11.0-deplate/app/views/admin/edit_web.rhtml
--- instiki-0.11.0/app/views/admin/edit_web.rhtml	2006-01-23 00:27:57.000000000 +0100
+++ instiki-0.11.0-deplate/app/views/admin/edit_web.rhtml	2006-04-12 18:20:30.389883000 +0200
@@ -24,7 +24,7 @@
     Markup:
     <select name="markup">
       <%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Mixed' => :mixed, 
-              'RDoc' => :rdoc }, @web.markup) %>
+      'RDoc' => :rdoc, 'Deplate' => :deplate }, @web.markup) %>
     </select>
 
     &nbsp;&nbsp;
diff -r -N -X exclude.txt -u3 instiki-0.11.0/app/views/deplate_help.rhtml instiki-0.11.0-deplate/app/views/deplate_help.rhtml
--- instiki-0.11.0/app/views/deplate_help.rhtml	1970-01-01 01:00:00.000000000 +0100
+++ instiki-0.11.0-deplate/app/views/deplate_help.rhtml	2006-04-12 18:20:58.159814000 +0200
@@ -0,0 +1,17 @@
+<h3>Deplate/Viki formatting tips (<a href="http://deplate.sf.net/deplate.html" onClick="quickRedReference(); return false;">advanced</a>)</h3>
+<table cellspacing="0" cellpadding="0">
+  <tr><td>-_your text__</td><td class="arrow">&rarr;</td><td><em>your text</em></td></tr>
+  <tr><td>TBD</td><td>TBD</td></tr>
+</table>
+    
+<script language="JavaScript">
+  function quickRedReference() {
+    window.open( 
+      "http://deplate.sf.net/deplate.html",
+      "redRef",
+      "height=600,width=550,channelmode=0,dependent=0," +
+      "directories=0,fullscreen=0,location=0,menubar=0," +
+      "resizable=0,scrollbars=1,status=1,toolbar=0" 
+    );
+  }
+</script>
diff -r -N -X exclude.txt -u3 instiki-0.11.0/lib/chunks/engines.rb instiki-0.11.0-deplate/lib/chunks/engines.rb
--- instiki-0.11.0/lib/chunks/engines.rb	2006-03-12 05:57:24.000000000 +0100
+++ instiki-0.11.0-deplate/lib/chunks/engines.rb	2006-04-12 18:20:37.319848000 +0200
@@ -57,6 +57,14 @@
     end
   end
 
-  MAP = { :textile => Textile, :markdown => Markdown, :mixed => Mixed, :rdoc => RDoc }
-  MAP.default = Textile
+  class Deplate < AbstractEngine
+    def mask
+      require_dependency 'deplatesupport'
+      DeplateString.new(@content).to_html
+    end
+  end
+
+  MAP = { :textile => Textile, :markdown => Markdown, :mixed => Mixed, :rdoc => RDoc, :deplate => Deplate }
+  # MAP.default = Textile
+  MAP.default = Deplate
 end
diff -r -N -X exclude.txt -u3 instiki-0.11.0/lib/deplatesupport.rb instiki-0.11.0-deplate/lib/deplatesupport.rb
--- instiki-0.11.0/lib/deplatesupport.rb	1970-01-01 01:00:00.000000000 +0100
+++ instiki-0.11.0-deplate/lib/deplatesupport.rb	2006-04-12 18:04:13.795609600 +0200
@@ -0,0 +1,13 @@
+DEPLATE='+++PATH_TO_DEPLATE+++/lib/'
+IMGBASEURL='http://+++BASEURL+++/'
+
+$LOAD_PATH << DEPLATE
+require 'deplate/deplate-string'
+
+o = DeplateString.deplate_options
+o.input_def = 'deplate-restricted'
+o.variables['headings']     = 'plain'
+o.variables['auxiliaryDir'] = 'public/files'
+o.variables['mandatoryID']  = true
+o.variables['htmlImgUrl']   = [IMGBASEURL, 'files/%s'].join
+