soywiki 0.2.7 → 0.2.8

data/README.markdown

@@ -1,7 +1,7 @@
 # SoyWiki
 
-SoyWiki turns Vim into a powerful, lean, and fast wiki.  It's got all
-the protein of a more conventional wiki, but a lot less of the fat and
+SoyWiki turns Vim into a powerful, lean, and fast wiki.  It's got all the
+protein of a more conventional wiki, but less saturated fat and no
 cholesterol. 
 
 A quick overview of its characteristics and features:
@@ -26,15 +26,15 @@ and refactor wiki content at the speed of thought.
 
 SoyWiki is good for tracking projects, contacts, ideas, and collecting
 and organizing research. SoyWiki combines the affordances of notebooks,
-index cards, and Post-it notes, and adds to them the power of hyperlinks
-and automatic indexing.
+index cards, and Post-it notes, and adds to them the power of
+hyperlinks, search, and automated refactoring.
 
-SoyWiki makes a great writing aid, especially if you do your writing in
+SoyWiki makes a good writing aid, especially if you do your writing in
 Vim. You can have SoyWiki open in multiple Vim windows, tabs, and
 buffers, alongside any number of regular Vim windows. Throw in a bunch
 of Vim abbreviations (`:help abbreviations`), a large monitor, and a
-teapot, and you'll have your paper, essay, book, or screenplay written
-in record time.
+teapot, and you'll have a powerful toolkit for writing your paper, essay,
+book, or screenplay. 
 
 SoyWiki is free and open source.
 
@@ -245,11 +245,12 @@ Then, type
 * `:SWLinkAppend [target]` performs `:SWAppend` and replaces the text with a WikiWord link
 
 `[target]` is the name of the file that contains the wiki page you're
-targeting. Press `TAB` for autocompletion help.
+targeting, e.g. `recipes/SoyRaspberrySmoothie`. Press `TAB` for
+autocompletion help.
 
-These commands will open the target page (if it isn't open already) in a
-split window and insert or append the selected text into it.  If the
-target page doesn't exist, it will be created.
+These four commands will open the target page (if it isn't open already)
+in a split window and insert or append the selected text into it.  If
+the target page doesn't exist, it will be created.
 
 You can use these shortcuts:
 
@@ -325,12 +326,11 @@ upstream on some server for all your computers to push to and pull from.
 
 
 If you want to edit a common SoyWiki with many other people, it's
-probably best to set up a common upstream Git repository and to work
-locally on a development branch before pulling the HEAD of the master
-branch from origin, merging your edits into it, and pushing the merged
-result back to origin. This process may be intimidating for
-non-programmers, so a future version of SoyWiki may provide a more
-user-friendly interface for distributed collaboration workflows.
+probably best to set up a common upstream Git repository (e.g. on
+GitHub, if the wiki content is for public consumption).  This process
+may be intimidating for non-programmers, so a future version of SoyWiki
+may provide a more user-friendly interface for distributed collaboration
+workflows.
 
 
 
@@ -378,7 +378,7 @@ of html pages. Type `soywiki --html` from the root directory of your wiki.
 SoyWiki adds a few convenient Vim macros that you can use anytime. 
 
 
-* The `\` key in normal mode reformat the current paragraph. It is equivalent to
+* `\` in normal mode reformats the current paragraph. It is equivalent to
 `gwap`. (`:help formatting`)
 * `,-` inserts a long dashed line
 * `,d` inserts the current date and time 

data/Rakefile

@@ -31,6 +31,7 @@ desc "build and push website"
 task :web => :build_webpage do
   puts "Building and pushing website"
   `scp website/soywiki.html zoe2@instantwatcher.com:~/danielchoi.com/public/software/`
+  `scp -r website/images-soywiki zoe2@instantwatcher.com:~/danielchoi.com/public/software/`
   `open http://danielchoi.com/software/soywiki.html`
 end
 

data/lib/soywiki.rb

@@ -1,7 +1,7 @@
 require 'string_ext'
 
 module Soywiki
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
   WIKI_WORD = /\b([a-z][\w_]+\.)?[A-Z][a-z]+[A-Z]\w*\b/
   HYPERLINK = %r|\bhttps?://[^ >)\n\]]+|
 

data/lib/soywiki.vim

@@ -557,13 +557,7 @@ func! s:global_mappings()
   noremap <silent> <leader>o :call <SID>find_next_href_and_open()<cr> 
   nnoremap <silent> q :close<cr>
 
-  " reflow text
-  nnoremap \ gwap 
-  " insert a line
-  nmap <Leader>- o<Esc>k72i-<Esc><CR>
-  " insert date
-  map <Leader>d :r !date<CR>o
- 
+
   command! -bar -nargs=1 -range -complete=file SWAppend :<line1>,<line2>call s:extract(<f-args>, 'append', 0)
   command! -bar -nargs=1 -range -complete=file SWInsert :<line1>,<line2>call s:extract(<f-args>, 'insert', 0)
   command! -bar -nargs=1 -range -complete=file SWLinkAppend :<line1>,<line2>call s:extract(<f-args>, 'append', 1)
@@ -605,7 +599,11 @@ func! s:prep_buffer()
 
     noremap <silent> <leader>? :call <SID>show_help()<cr>
 
-    set nu
+    nnoremap \ gwap 
+    nmap <Leader>- o<Esc>k72i-<Esc><CR>
+    map <Leader>d :r !date<CR>o
+
+    "   set nu
     setlocal completefunc=CompletePageTitle
     augroup <buffer>
       au!

data/website/soywiki-template.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-      <title>Vmail</title>
+      <title>SoyWiki</title>
       <link href="stylesheets-vmail/reset.css?{{timestamp}}" media="screen" rel="stylesheet" type="text/css" />
       <link href="stylesheets-vmail/960.css?{{timestamp}}" media="screen" rel="stylesheet" type="text/css" />
       <link href="stylesheets-vmail/text.css?{{timestamp}}" media="screen" rel="stylesheet" type="text/css" />

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Daniel Choi