Dicking around with markdown

airhorns · Feb 16, 2012 · e0fbb60 · e0fbb60
1 parent 3e7cb24
commit e0fbb60
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 240 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -22,9 +22,6 @@
 [submodule "vim/bundle/supertab"]
 	path = vim/bundle/supertab
 	url = http://github.com/ervandew/supertab.git
-[submodule "vim/bundle/vim-markdown-preview"]
-	path = vim/bundle/vim-markdown-preview
-	url = https://github.com/robgleeson/vim-markdown-preview.git
 [submodule "vim/bundle/scss-syntax.vim"]
 	path = vim/bundle/scss-syntax.vim
 	url = https://github.com/cakebaker/scss-syntax.vim.git
@@ -85,3 +82,6 @@
 [submodule "vim/bundle/mango"]
 	path = vim/bundle/mango
 	url = https://github.com/goatslacker/mango.vim
+[submodule "vim/bundle/tagbar"]
+	path = vim/bundle/tagbar
+	url = https://github.com/majutsushi/tagbar.git
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -1,4 +1,4 @@
-rm ../.bash_profile ../.bashrc ../.gitignore ../.gitconfig ../.gvimrc ../.vimrc ../.vim ../.toprc ../.screenrc ../.rdebugrc ../.ackrc
+rm ../.bash_profile ../.bashrc ../.gitignore ../.gitconfig ../.gvimrc ../.vimrc ../.vim ../.toprc ../.screenrc ../.rdebugrc ../.ackrc ../.rdebugrc ../.ctags
 
 ln -s ~/dotfiles/bash/bash_profile ../.bash_profile
 ln -s ~/dotfiles/bash/bashrc ../.bashrc
@@ -11,5 +11,6 @@ ln -s ~/dotfiles/screenrc ../.screenrc
 ln -s ~/dotfiles/toprc ../.toprc
 ln -s ~/dotfiles/.ackrc ../.ackrc
 ln -s ~/dotfiles/rdebugrc ../.rdebugrc
+ln -s ~/dotfiles/ctags ../.ctags
 
 git config --global core.excludesfile ~/.gitignore
diff --git a/ctags b/ctags
@@ -0,0 +1,5 @@
+--langdef=coffee
+--langmap=coffee:.coffee
+--regex-coffee=/^[ \t]*class[ \t]+([A-Za-z\.]+)[ \t]*.*$/\1/c,class/
+--regex-coffee=/^[ \t]*\@?(::)?([A-Za-z\.]+)[ \t]*(:|=).*->.*$/\2/f,function/
+--regex-coffee=/^[ \t]*\@(classA|a)?ccessor[ \t]*("|')([A-Za-z\.]+)("|').*->.*$/\3/a,accessor/
diff --git a/vim/bundle/coffee-script b/vim/bundle/coffee-script
diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp
diff --git a/vim/bundle/endwise b/vim/bundle/endwise
diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar
diff --git a/vim/bundle/vim-markdown/ftdetect/markdown.vim b/vim/bundle/vim-markdown/ftdetect/markdown.vim
diff --git a/vim/bundle/vim-markdown/ftplugin/markdown.vim b/vim/bundle/vim-markdown/ftplugin/markdown.vim
diff --git a/vim/bundle/vim-markdown/syntax/markdown.vim b/vim/bundle/vim-markdown/syntax/markdown.vim
diff --git a/vim/syntax/mkd.vim b/vim/syntax/mkd.vim
diff --git a/vim/syntax/percolate.vim b/vim/syntax/percolate.vim
@@ -9,7 +9,7 @@ syntax include @Markdown syntax/markdown.vim
 let b:current_syntax = ''
 unlet b:current_syntax
 syntax include @Coffee syntax/coffee.vim
-syntax region coffeeScriptCode matchgroup=Snip start="\~\~\~" end="\~\~\~" containedin=@Markdown contains=@Coffee
+syntax region coffeeScriptCode matchgroup=Snip start="\!\!\!" end="\!\!\!" containedin=@Markdown contains=@Coffee
 
 syn region markdownCoffeeCodeBlock start="    \|\t" end="$" containedin=@Markdown contains=@Coffee
 

diff --git a/vim/vimrc b/vim/vimrc
@@ -249,5 +249,5 @@ let g:tagbar_type_coffee = {
 \},
 \ 'sro' : ".",
 \ 'ctagsbin' : 'coffeetags',
-\ 'ctagsargs' : '--include-vars ',
+\ 'ctagsargs' : '',
 \}