improved xml handling

2 files changed, 26 insertions, 4 deletions

diff --git a/doc/shortcuts.txt b/doc/shortcuts.txt
index fd21674..7b5b78b 100644
--- a/doc/shortcuts.txt
+++ b/doc/shortcuts.txt
@@ -66,7 +66,8 @@ notice, that registers get used for both: macro recordings and copying text
 
 [marker]
 ma              = set marker a-z (a in this case)
-'a              = go to marker a
+`a              = go to marker a (line & column)
+'a              = go to marker a (line, first non blank), same as `a^
 
 
 [hotkeys]
@@ -124,6 +125,10 @@ gn              = makes the directory under the cursor the root directory
 a               = toggles display of hidden files
 
 
+[filetype:css]
+viB:sort       = sort inner block by name
+
+
 [vim modeline]
 filetype can have multiple values, like python.django
 The last line can be a mode line, which holds settings like tab width:
diff --git a/vimrc b/vimrc
index 48f8435..2217daa 100644
--- a/vimrc
+++ b/vimrc
@@ -209,6 +209,7 @@ inoremap <C-Space> <C-x><C-o>
 vnoremap < <gv|                   " allows deindenting a selected block and keeps selection
 vnoremap > >gv|                   " allows indenting a selected block and keeps selection
 
+
 " Bind CTRL+Backspace to vims version (CTRL+W) in " <CR> insert mode (only works with gvim)
 inoremap
       \ <C-Backspace>
@@ -257,6 +258,7 @@ set nocursorcolumn            | " turn visual cursor column off (improves perfor
 set nocursorline              | " turn visual cursor line off (improves performance)
 set nrformats+=alpha          | " allows CTRL-A & CTRL-X to increment and decrement letters, not just numbers
 set nofoldenable              | " disable code folding. I hate code folding
+set foldcolumn=4              | " if code folding gets used display it in the clutter bar, where line numbers live
 set relativenumber            | " relative line numbers can speed up navigation
 set noshowmode                | " because we are using some powerline derivat
 set nostartofline             | " when scrolling: do not move the cursor to column 1
@@ -366,9 +368,25 @@ if has("autocmd")
   " hitting K over a keyword shows a help in a buffer.
   " Here we define the commands used to look those keywords up
   " as per file type...
-  augroup keyword_lookups
+  augroup filetype_specific
     autocmd FileType python setlocal keywordprg=pydoc
     autocmd FileType vim    setlocal keywordprg=:help |.
+    autocmd FileType c,cpp  setlocal equalprg=clang-format
+
+    " keyboard mapping for xml alike languages
+    " Alt-Up : Move cursor up one tag
+    " Alt-Down: Move cursor down one tag
+    " leader-=: tidies currently selected tag and subtags and sorts attributes by name (alphabetically)
+    autocmd Filetype html,htmldjango,xml
+      \ :nnoremap
+              \ <M-Down>
+              \ :call search('^ *<', 'e')<CR>:nohlsearch<CR>|
+      \ :nnoremap
+              \ <M-Up>
+              \ :call search('^ *<', 'eb')<CR>:nohlsearch<CR>|
+      \ :nnoremap
+              \ <leader>=
+              \ vat:'<,'>!tidy -xml --wrap 0 --sort-attributes alpha 2>/dev/null<CR>vat=
   augroup END
 
 
@@ -434,8 +452,7 @@ else
   nnoremap <leader>t :new +terminal<CR>
 endif
 
-
-
+nnoremap <leader>r :syntax sync fromstart
 
 " colorscheme base16-embers
 " colorscheme base16-flat