soywiki 0.1.2 → 0.1.3

data/README.markdown

@@ -124,9 +124,9 @@ commands:
 * `CTRL-k` and `CTRL-j` move the cursor directly to the next or previous WikiLink on the page
 * `ENTER` follows the WikiLink under the cursor
 * `,f` follows the first WikiLink after the cursor
-* `CTRL-l` opens a WikiLink in a split window
-* `CTRL-n` does the same, but in a vertical split window
-* Both `q` and `CTRL-h` close a split window 
+* `CTRL-l` opens a WikiLink in a vertical split window
+* `CTRL-n` does the same, but in a regular split window
+* Both `CTRL-h` and `q` close a split window 
 
 These key mappings may not be very mnemonic, but they are easy to
 memorize through muscle memory and were chosen to keep the hands
@@ -336,10 +336,11 @@ this has happened by including markers along with the WikiWord that was
 expanded. Seamless expansion does not mark a point of expansion with
 anything, and it erases the WikiWord that got expanded. 
 
-* `,x` expands a wiki page seamfully
-* `,X` expands a wiki page seamlessly
-* `,vx` expands a wiki page seamfully and opens on a vertical split
-* `,vX` expands a wiki page seamlessly and opens on a vertical split
+* `,x` expands a wiki page seamfully and opens on a vertical split
+* `,X` expands a wiki page seamlessly and opens on a vertical split
+* `,nx` expands a wiki page seamfully and opens on normal split
+* `,nX` expands a wiki page seamlessly and opens on a normal split
+* `q` closes the expanded view window
 
 Both modes of expansion are useful when you want to assemble a long
 piece of writing by using one page as a master outline that links to

data/lib/soywiki.rb

@@ -20,7 +20,7 @@ end
 
 
 module Soywiki
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   WIKI_WORD = /\b([a-z][\w_]+\.)?[A-Z][a-z]+[A-Z]\w*\b/
 
   def self.run

data/lib/soywiki.vim

@@ -155,9 +155,9 @@ func! s:load_page(page, split)
     call writefile([title, '', ''], file) 
   endif
   if (a:split == 2) 
-    exec "vsplit ". file
+    exec "botright vsplit ". file
   else
-    exec "split ". file
+    exec "botright split ". file
   endif
   if (a:split == 0) 
     wincmd p 
@@ -530,8 +530,8 @@ func! s:prep_buffer()
   if (s:is_wiki_page())
     set textwidth=72
     nnoremap <buffer> <cr> :call <SID>follow_link_under_cursor(0)<cr> 
-    nnoremap <buffer> <c-l> :call <SID>follow_link_under_cursor(1)<cr> 
-    nnoremap <buffer> <c-n> :call <SID>follow_link_under_cursor(2)<cr> 
+    nnoremap <buffer> <c-l> :call <SID>follow_link_under_cursor(2)<cr> 
+    nnoremap <buffer> <c-n> :call <SID>follow_link_under_cursor(1)<cr> 
     noremap <buffer> <leader>f :call <SID>follow_link(0)<CR>
     noremap <buffer> <c-j> :call <SID>find_next_wiki_link(0)<CR>
     noremap <buffer> <c-k> :call <SID>find_next_wiki_link(1)<CR>
@@ -546,11 +546,10 @@ func! s:prep_buffer()
     command! -buffer SWBlame :call s:show_blame()
     noremap <buffer> <leader>b :call <SID>show_blame()<CR>
 
-    noremap <buffer> <leader>x :call <SID>expand(0,0)<CR>
-    noremap <buffer> <leader>X :call <SID>expand(1,0)<CR>
-    noremap <buffer> <leader>vx :call <SID>expand(0,1)<CR>
-    noremap <buffer> <leader>vX :call <SID>expand(1,1)<CR>
-    noremap <buffer> <leader>VX :call <SID>expand(1,1)<CR>
+    noremap <buffer> <leader>x :call <SID>expand(0,1)<CR>
+    noremap <buffer> <leader>X :call <SID>expand(1,1)<CR>
+    noremap <buffer> <leader>nx :call <SID>expand(0,0)<CR>
+    noremap <buffer> <leader>nX :call <SID>expand(1,0)<CR>
 
     noremap <silent> <leader>? :call <SID>show_help()<cr>
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Daniel Choi