diff --git a/README.markdown b/README.markdown index 45b0b7c..21cf6c9 100644 --- a/README.markdown +++ b/README.markdown @@ -90,6 +90,8 @@ let g:wordy#ring = [ \ 'puffery', \ ['problematic', 'redundant', ], \ ['colloquial', 'idiomatic', 'similies', ], + \ 'art-jargon', + \ ['contractions', 'opinion', 'vague-time', 'said-synonyms', ], \ ] ``` @@ -122,10 +124,17 @@ go to those words flagged by _wordy_. * `]s` - Move to next misspelled word after the cursor. * `[s` - Like `]s` but search backwards +_NEW_ - You can browse through a flattened list of dictionaries specified +in your ring with: + +``` +:Wordy +``` + ### Weak and lazy usage ``` -:WeakWordy (weak) +:Wordy weak ``` Weak and lazy words are common in first drafts. @@ -153,8 +162,8 @@ asking whether it detracts from the point you are trying to make. ### Redundant and problematic usage ``` -:WordyWordy (redundant) -:ProblemWordy (problematic) +:Wordy redundant +:Wordy problematic ``` Did you ever receive an ‘advance warning’ when a mere warning would do? @@ -167,7 +176,7 @@ erase redundancies, as the British will ‘protest against’ where Americans will simply ‘protest’. See [50 Problem Words and Phrases][1] for more detail on those issues -targeted by _ProblemWordy_. +targeted by _problematic_. [1]: http://www.dailywritingtips.com/50-problem-words-and-phrases/ @@ -178,9 +187,9 @@ targeted by _ProblemWordy_. > personality.” (puffery and jargon) ``` -:PuffWordy (puffery) -:JargonWordy (business-jargon) -:ArtJargonWordy (art-jargon) +:Wordy puffery +:Wordy business-jargon +:Wordy art-jargon ``` Instead of puffery, demonstrate through details. @@ -192,7 +201,7 @@ Instead of puffery, demonstrate through details. ### Manipulative language ``` -:WeaselWordy (weasel) +:Wordy weasel ``` Words can be used to hide or obscure a weak position, or to cast doubt on @@ -209,8 +218,8 @@ will seek to purge such loaded language from your writing. ### To be and the passive voice ``` -:BeingWordy (being) -:PassiveWordy (being, passive-voice) +:Wordy being +:Wordy passive-voice ``` You may find this dictionary useful in avoiding overuse of the many forms @@ -219,7 +228,9 @@ of the verb to be, often found in overly-passive sentences. ### Colloquialisms, Idioms, and Similies ``` -:TriteWordy (colloquial, idiomatic, similies) +:Wordy colloquial +:Wordy idiomatic +:Wordy similies ``` Dictionaries for uncovering the tired cliché, including colloquial and @@ -228,22 +239,22 @@ idiomatic phrases scraped from Wiktionary and Wikipedia. ### Miscellaneous ``` -:SaidWordy (said-synonyms) -:OpineWordy (opinion) -:AintWordy (contractions) -:VagueTimeWordy (vague-time) +:Wordy said-synonyms +:Wordy opinion +:Wordy contractions +:Wordy vague-time ``` A few dictionaries to serve specific needs. If you’re writing to be neutral, you will want to avoid editorializing -(_OpineWordy_) and loaded use of ‘said’ (_SaidWordy_). +(`opinion`) and loaded use of ‘said’ (`said-synonyms`). If you’re writing formally, you’ll want to identify unintentional -contractions with _AintWordy_. A warning that it’s not yet capturing most +contractions with `contractions`. A warning that it’s not yet capturing most instances of “’s”, such as “Joe’s not here.” -And finally, _VagueTimeWordy_ finds where you are using vague descriptions of +And finally, `vague-time` finds where you are using vague descriptions of time where you could be more specific. ## See also diff --git a/autoload/wordy.vim b/autoload/wordy.vim index a5c1481..023e55e 100644 --- a/autoload/wordy.vim +++ b/autoload/wordy.vim @@ -89,4 +89,19 @@ function! wordy#jump(mode) endif endfunction +" Code from bairui@#vim.freenode +" https://gist.github.com/3322468 +function! wordy#flatten(list) + let val = [] + for elem in a:list + if type(elem) == type([]) + call extend(val, wordy#flatten(elem)) + else + call add(val, elem) + endif + unlet elem + endfor + return val +endfunction + " vim:ts=2:sw=2:sts=2 diff --git a/plugin/wordy.vim b/plugin/wordy.vim index dcad5cd..0c949c0 100644 --- a/plugin/wordy.vim +++ b/plugin/wordy.vim @@ -18,28 +18,6 @@ let g:wordy_dir = fnamemodify(resolve(expand(':p')), ':h:h') command -nargs=0 NoWordy call wordy#init({}) -command -nargs=0 BeingWordy call wordy#init({ 'd': 'being' }) -command -nargs=0 PassiveWordy call wordy#init({ 'd': ['passive-voice', 'being',] }) - -command -nargs=0 WeakWordy call wordy#init({ 'd': 'weak' }) -command -nargs=0 LazyWordy call wordy#init({ 'd': 'weak' }) - -command -nargs=0 ProblemWordy call wordy#init({ 'd': 'problematic' }) -command -nargs=0 WordyWordy call wordy#init({ 'd': 'redundant' }) - -command -nargs=0 JargonWordy call wordy#init({ 'd': 'business-jargon' }) -command -nargs=0 ArtJargonWordy call wordy#init({ 'd': 'art-jargon' }) -command -nargs=0 PuffWordy call wordy#init({ 'd': 'puffery' }) -command -nargs=0 WeaselWordy call wordy#init({ 'd': 'weasel' }) - -command -nargs=0 TriteWordy call wordy#init({ 'd': ['colloquial', 'idiomatic', 'similies',] }) - -" tools for formal and objective writing -command -nargs=0 VagueTimeWordy call wordy#init({ 'd': 'vague-time' }) -command -nargs=0 OpineWordy call wordy#init({ 'd': 'opinion' }) -command -nargs=0 SaidWordy call wordy#init({ 'd': 'said-synonyms' }) -command -nargs=0 AintWordy call wordy#init({ 'd': 'contractions' }) - command -nargs=0 NextWordy call wordy#jump(1) command -nargs=0 PrevWordy call wordy#jump(-1) @@ -55,9 +33,39 @@ if !exists('g:wordy#ring') \ 'puffery', \ ['problematic', 'redundant', ], \ ['colloquial', 'idiomatic', 'similies', ], + \ 'art-jargon', + \ ['contractions', 'opinion', 'vague-time', 'said-synonyms', ], \ ] endif +function! chooseDict(ArgLead, CmdLine, CursorPos) + return wordy#flatten(g:wordy#ring) +endfunction + +" Wordy {dict_name} +command -nargs=1 + \ -complete=customlist,chooseDict + \ Wordy + \ call wordy#init({ 'd': }) + +" start.DEPRECATED - will be removed at some point in future +command -nargs=0 BeingWordy call wordy#init({ 'd': 'being' }) +command -nargs=0 PassiveWordy call wordy#init({ 'd': ['passive-voice', 'being',] }) +command -nargs=0 WeakWordy call wordy#init({ 'd': 'weak' }) +command -nargs=0 LazyWordy call wordy#init({ 'd': 'weak' }) +command -nargs=0 ProblemWordy call wordy#init({ 'd': 'problematic' }) +command -nargs=0 WordyWordy call wordy#init({ 'd': 'redundant' }) +command -nargs=0 JargonWordy call wordy#init({ 'd': 'business-jargon' }) +command -nargs=0 ArtJargonWordy call wordy#init({ 'd': 'art-jargon' }) +command -nargs=0 PuffWordy call wordy#init({ 'd': 'puffery' }) +command -nargs=0 WeaselWordy call wordy#init({ 'd': 'weasel' }) +command -nargs=0 TriteWordy call wordy#init({ 'd': ['colloquial', 'idiomatic', 'similies',] }) +command -nargs=0 VagueTimeWordy call wordy#init({ 'd': 'vague-time' }) +command -nargs=0 OpineWordy call wordy#init({ 'd': 'opinion' }) +command -nargs=0 SaidWordy call wordy#init({ 'd': 'said-synonyms' }) +command -nargs=0 AintWordy call wordy#init({ 'd': 'contractions' }) +" end.DEPRECATED + let &cpo = s:save_cpo unlet s:save_cpo " vim:ts=2:sw=2:sts=2