From 45b30538f731a82864bca6ebacec8f0e733a276b Mon Sep 17 00:00:00 2001
From: jimi <jinfield@gmail.com>
Date: Mon, 9 Aug 2010 14:08:56 -0500
Subject: [PATCH] Add Rakefile, eruby and html updates

  - Rakefile eases installation and updates
  - eruby: refactor link_to and nav elements
  - html: refactor repeating <li> elements and nav menu <ul>
    Include html5 snippets: header, section, aside, and nav
  - Also setup html5shiv for misbehaving browsers
---
 Rakefile                     | 22 +++++++++++++++++
 ftplugin/eruby/eruby.xpt.vim |  8 +++++-
 ftplugin/html/html.xpt.vim   | 48 +++++++++++++++++++++++++++---------
 3 files changed, 65 insertions(+), 13 deletions(-)
 create mode 100644 Rakefile
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..85a00f5
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,22 @@
+HOME = ENV['HOME']
+DEST = "#{HOME}/.vim/personal"
+SRC = "ftplugin"
+
+directory DEST
+
+task :default => :install
+
+desc "Hardlink snippets into the ~/.vim/personal directory"
+task :install => DEST do
+  run "cp -avl #{SRC} #{DEST}/"
+end
+
+desc "Remove obsolete from and copy new snippets to ~/.vim/personal"
+task :sync => :install do
+  run "rsync -ri --delete #{SRC} #{DEST}/"
+end
+
+def run(cmd)
+  puts cmd
+  system cmd
+end
diff --git a/ftplugin/eruby/eruby.xpt.vim b/ftplugin/eruby/eruby.xpt.vim
index 8af27d2..ebb48fa 100644
--- a/ftplugin/eruby/eruby.xpt.vim
+++ b/ftplugin/eruby/eruby.xpt.vim
@@ -49,7 +49,13 @@ XSET target=Echo('')
 <%= link_to `link^, `target^ %>
 
 XPT link_to_img synonym=ltim " <%= link_to image...
-`:link_to({'link' : ':it:'}):^
+`:link_to({ 'link' : ':it:' }):^
+
+XPT lta
+`:li({ 'content' : ':link_to:' }):^
+
+XPT enav synonym=nave,nav5
+`:nav({ ':lia:' : ':lta:' }):^
 
 XPT form_for synonym=ff " <% form_for @model do...
 <% form_for `@obj^ do |`f^| -%>
diff --git a/ftplugin/html/html.xpt.vim b/ftplugin/html/html.xpt.vim
index 3e4a05c..c777237 100644
--- a/ftplugin/html/html.xpt.vim
+++ b/ftplugin/html/html.xpt.vim
@@ -4,7 +4,6 @@ XPTemplate priority=personal
 
 let s:f = g:XPTfuncs()
 
-XPTvar $blank ' '
 XPTvar $js_dir 'javascripts'
 XPTvar $css_dir 'stylesheets'
 XPTvar $jq_ver '1.4.2.min'
@@ -32,7 +31,7 @@ XPT doctype " <!DOCTYPE...
 <!DOCTYPE html` `PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"^>
 
-XPT doctype5 " <!DOCTYPE html>
+XPT doctype5 synonym=doc5 " <!DOCTYPE html>
 <!DOCTYPE html>
 
 XPT charset " <meta charset...
@@ -106,25 +105,30 @@ XSET val|post=Echo(V()=~'\V\^ id=""\$\|val' ? '' : V())
 </div>
 <!--`val^ -->
 
-XPT ul abbr alias=_tagAttr " <ul att?...
+XPT blockTag wrap=content hidden " <$_xSnipName >\n .. \n</$_xSnipName>
+<`$_xSnipName^` `att?^>
+    `content^^
+</`$_xSnipName^>
 
-XPT ol abbr alias=_tagAttr " <ol att?...
+XPT ul abbr alias=blockTag
+
+XPT ol abbr alias=blockTag
 
 XPT li abbr " <li>..</li>...
 XSET content=Echo('')
-<li>`content^</li>
+<li>`content^</li>`
+`...^
+<li>`content^</li>`
+`...^
 
 XPT lia abbr " <li><a href=...
 XSET href=#
 `:li( { 'content' : ':a:' } ):^
 
-XPT nav synonym=menu " <ul id='nav'...
-XSET nav=$_xSnipName
-<ul` id="`nav`"^>
-    `:lia:^`
-    `...^
-    `:lia:^`
-    `...^
+XPT menu synonym=navigation " <ul id='menu'...
+XSET id=$_xSnipName
+<ul` id="`id`"^>
+    `:lia:^
 </ul>
 
 XPT a wrap=content " <a href...
@@ -143,3 +147,23 @@ XSET content=Echo('')
 <!--[if lt IE 9]>
 `content^
 <![endif]-->
+
+"
+" HTML5 Snippets
+"
+
+XPT header alias=blockTag
+
+XPT section alias=blockTag
+
+XPT aside alias=blockTag
+
+XPT nav " <nav class="...
+<nav` `att?^>
+<ul>
+    `:lia:^
+</ul>
+</nav>
+
+XPT html5shiv synonym=shiv,5shiv
+<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
