Initial commit

Author: fmoralesc

README.mkd

@@ -0,0 +1,52 @@
+# vim-criticmarkup
+
+Adds [criticmarkup][] support to vim. Attaches to `pandoc`, `markdown`, `mkd`
+and `txt` filetypes.
+
+[criticmarkup]: http://criticmarkup.com/
+
+![screenshot](http://i.imgur.com/cdlK1ek.png)
+
+## Basic syntax
+
+criticmarkup can be used to annotate additions, deletions, substitutions,
+highlights and comments in a text document.
+
+### Additions
+
+    That was a {++very ++}hasty comment.
+
+### Deletions
+
+    It is {--not --} uncommon for people to tell the truth.
+
+### Substitutions
+
+    The {~~bird~>condor~~} flew majestic through the skies.
+
+### Comments
+
+    I believe this is not enough.{>> @editor on what grounds? <<}
+
+### Highlights
+
+    {==Some sources==}{>> Which? <<} mention ὰταραξία as the ancient skeptics goal.
+
+## Handling annotations
+
+vim-criticmarkup creates a command, `:Critic`, that can accept, reject and
+delete annotations. To accept an edit, simply place the cursor inside the
+annotation and then execute
+
+    :Critic accept
+
+If you want to reject it, use
+
+    :Critic reject
+
+Currently, neither accept or reject work on highlights or comments.
+
+## TODO
+
+* Expand `accept`s and `reject`s to handle highlights and comments.
+* Implement operators and keyboard mappings to create annotations.

autoload/criticmarkup.vim

@@ -0,0 +1,73 @@
+function! criticmarkup#Init()
+    command! -buffer -nargs=1 -complete=custom,criticmarkup#CriticCompleteFunc 
+                \Critic call criticmarkup#Critic("<args>")
+endfunction
+
+function! criticmarkup#InjectHighlighting()
+    syn region criticAddition start=/{++/ end=/++}/ 
+    syn region criticDeletion start=/{--/ end=/--}/
+    syn region criticSubstitutionDeletion start=/{\~\~/ end=/.\(\~>\)\@=/
+    syn region criticSubstitutionAddition start=/\~>/ end=/\~\~}/
+    syn region criticComment start=/{>>/ end=/<<}/
+    syn region criticHighlight start=/{==/ end=/==}/
+
+    hi criticAddition guibg=#00ff00 guifg=#101010
+    hi criticDeletion guibg=#ff0000 guifg=#ffffff
+    hi link criticSubstitutionAddition criticAddition
+    hi link criticSubstitutionDeletion criticDeletion
+    hi criticComment guibg=#0099FF guifg=#101010
+    hi criticHighlight guibg=#ffff00 guifg=#101010
+endfunction
+
+function! criticmarkup#Accept()
+    let kind = synIDattr(synID(line("."), col("."), 1), "name")
+    if kind == "criticAddition"
+        call search("{++", "cb")
+        normal d3l
+        call search("++}", "c")
+        normal d3l
+    elseif kind == "criticDeletion"
+        call search("{--", "cb")
+        "fails at end of line
+        exe "normal d/\\(--}\\)\\@<=\\_.\<cr>"
+    elseif kind =~ "criticSubstitution"
+        call search('{\~\~', "cb")
+        exe "normal d/\\(\\~>\\)\\@<=\\_.\<cr>"
+        call search('\~\~}', "c")
+        exe "normal d/\\(\\~\\~}\\)\\@<=\\_.\<cr>"
+    endif
+endfunction
+
+function! criticmarkup#Reject()
+    let kind = synIDattr(synID(line("."), col("."), 1), "name")
+    if kind == "criticDeletion"
+        call search("{--", "cb")
+        normal df}
+        call search("--}", "c")
+        normal d3l
+    elseif kind == "criticAddition"
+        call search("{++", "cb")
+        normal df}
+    elseif kind =~ "criticSubstitution"
+        call search('{\~\~', "cb")
+        normal df>
+        call search('\~\~}', "c")
+        normal df}
+    endif
+endfunction
+
+function! criticmarkup#Critic(args)
+    if a:args =~ "accept"
+        call criticmarkup#Accept()
+    elseif a:args =~ "\(reject\|delete\)"
+        call criticmarkup#Reject()
+    endif
+endfunction
+
+function! criticmarkup#CriticCompleteFunc(a, c, p)
+    if len(split(a:c, " ", 1)) < 3
+        return "accept\nreject\ndelete"
+    else
+        return ""
+    endif
+endfunction

plugin/criticmarkup.vim

@@ -0,0 +1,4 @@
+augroup criticmarkup
+    au! Filetype pandoc,markdown,mkd,txt call criticmarkup#Init()
+    au! Syntax pandoc,markdown,mkd,txt call criticmarkup#InjectHighlighting()
+augroup END