mirror of
https://github.com/altercation/solarized
synced 2024-11-12 23:27:17 +00:00
Merge commit 'a8c94682fe86e556d190b8d22868538ad6149b3b'
This commit is contained in:
Ethan Schoonover
commit
680df556d9
3 changed files with 48 additions and 12 deletions
|
|
@ -988,14 +988,20 @@ if g:colors_name == "solarized" && g:solarized_menu != 0
|
|||
amenu &Solarized.&Contrast.&Low\ Contrast :let g:solarized_contrast="low" \| colorscheme solarized<CR>
|
||||
amenu &Solarized.&Contrast.&Normal\ Contrast :let g:solarized_contrast="normal" \| colorscheme solarized<CR>
|
||||
amenu &Solarized.&Contrast.&High\ Contrast :let g:solarized_contrast="high" \| colorscheme solarized<CR>
|
||||
an &Solarized.&Contrast.-sep- <Nop>
|
||||
amenu &Solarized.&Contrast.&Help:\ Contrast :help 'solarized_contrast'<CR>
|
||||
|
||||
amenu &Solarized.&Visibility.&Low\ Visibility :let g:solarized_visibility="low" \| colorscheme solarized<CR>
|
||||
amenu &Solarized.&Visibility.&Normal\ Visibility :let g:solarized_visibility="normal" \| colorscheme solarized<CR>
|
||||
amenu &Solarized.&Visibility.&High\ Visibility :let g:solarized_visibility="high" \| colorscheme solarized<CR>
|
||||
an &Solarized.&Visibility.-sep- <Nop>
|
||||
amenu &Solarized.&Visibility.&Help:\ Visibility :help 'solarized_visibility'<CR>
|
||||
|
||||
amenu &Solarized.&Background.&Toggle\ Background :ToggleBG<CR>
|
||||
amenu &Solarized.&Background.&Dark\ Background :set background=dark \| colorscheme solarized<CR>
|
||||
amenu &Solarized.&Background.&Light\ Background :set background=light \| colorscheme solarized<CR>
|
||||
an &Solarized.&Background.-sep- <Nop>
|
||||
amenu &Solarized.&Background.&Help:\ ToggleBG :help togglebg<CR>
|
||||
|
||||
if g:solarized_bold==0 | let l:boldswitch="On" | else | let l:boldswitch="Off" | endif
|
||||
exe "amenu &Solarized.&Styling.&Turn\\ Bold\\ ".l:boldswitch." :let g:solarized_bold=(abs(g:solarized_bold-1)) \\| colorscheme solarized<CR>"
|
||||
|
|
@ -1010,13 +1016,19 @@ if g:colors_name == "solarized" && g:solarized_menu != 0
|
|||
|
||||
if g:solarized_hitrail==0 | let l:hitrailswitch="On" | else | let l:hitrailswitch="Off" | endif
|
||||
exe "amenu &Solarized.&Experimental.&Turn\\ Highlight\\ Trailing\\ Spaces\\ ".l:hitrailswitch." :let g:solarized_hitrail=(abs(g:solarized_hitrail-1)) \\| colorscheme solarized<CR>"
|
||||
an &Solarized.&Experimental.-sep- <Nop>
|
||||
amenu &Solarized.&Experimental.&Help:\ HiTrail :help 'solarized_hitrail'<CR>
|
||||
|
||||
an &Solarized.-sep1- <Nop>
|
||||
|
||||
amenu &Solarized.&Autogenerate\ options :SolarizedOptions<CR>
|
||||
|
||||
an &Solarized.-sep2- <Nop>
|
||||
|
||||
amenu &Solarized.&Help.&Solarized\ Help :help solarized<CR>
|
||||
amenu &Solarized.&Help.&Toggle\ Background\ Help :help togglebg<CR>
|
||||
amenu &Solarized.&Help.&Removing\ This\ Menu :help solarized-menu<CR>
|
||||
|
||||
amenu &Solarized.&Autogenerate\ options :SolarizedOptions<CR>
|
||||
|
||||
an 9999.77 &Help.&Solarized\ Colorscheme :help solarized<CR>
|
||||
an 9999.78 &Help.&Toggle\ Background :help togglebg<CR>
|
||||
an 9999.79 &Help.-sep3- <Nop>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
*solarized.vim* for Vim version 7.3 or newer. Modified: 2011 Apr 29
|
||||
*solarized.vim* for Vim version 7.3 or newer. Modified: 2011 May 05
|
||||
|
||||
|
||||
Solarized Vim Colorscheme by Ethan Schoonover ~
|
||||
|
|
@ -157,6 +157,7 @@ g:solarized_underline = 1 | 0
|
|||
g:solarized_italic = 1 | 0
|
||||
g:solarized_contrast = "normal"| "high" or "low"
|
||||
g:solarized_visibility= "normal"| "high" or "low"
|
||||
g:solarized_hitrail = 0 | 1
|
||||
g:solarized_menu = 1 | 0
|
||||
------------------------------------------------
|
||||
|
||||
|
|
@ -164,7 +165,7 @@ g:solarized_menu = 1 | 0
|
|||
OPTION DETAILS
|
||||
|
||||
------------------------------------------------
|
||||
g:solarized_termcolors= 256 | 16
|
||||
g:solarized_termcolors= 256 | 16 *'solarized_termcolors'*
|
||||
------------------------------------------------
|
||||
The most important option if you are using vim in terminal (non gui) mode!
|
||||
This tells Solarized to use the 256 degraded color mode if running in a 256
|
||||
|
|
@ -183,7 +184,7 @@ isn't bad looking and has been extensively tweaked, but it's still not quite
|
|||
the real thing.
|
||||
|
||||
------------------------------------------------
|
||||
g:solarized_termtrans = 0 | 1
|
||||
g:solarized_termtrans = 0 | 1 *'solarized_termtrans'*
|
||||
------------------------------------------------
|
||||
If you use a terminal emulator with a transparent background and Solarized
|
||||
isn't displaying the background color transparently, set this to 1 and
|
||||
|
|
@ -195,40 +196,53 @@ default as this is almost always the best option. The only exception to this
|
|||
is if the working terminfo file supports 256 colors (xterm-256color).
|
||||
|
||||
------------------------------------------------
|
||||
g:solarized_degrade = 0 | 1
|
||||
g:solarized_degrade = 0 | 1 *'solarized_degrade'*
|
||||
------------------------------------------------
|
||||
For test purposes only; forces Solarized to use the 256 degraded color mode
|
||||
to test the approximate color values for accuracy.
|
||||
|
||||
------------------------------------------------
|
||||
g:solarized_bold = 1 | 0
|
||||
g:solarized_bold = 1 | 0 *'solarized_bold'*
|
||||
------------------------------------------------
|
||||
------------------------------------------------
|
||||
g:solarized_underline = 1 | 0
|
||||
g:solarized_underline = 1 | 0 *'solarized_underline'*
|
||||
------------------------------------------------
|
||||
------------------------------------------------
|
||||
g:solarized_italic = 1 | 0
|
||||
g:solarized_italic = 1 | 0 *'solarized_italic'*
|
||||
------------------------------------------------
|
||||
If you wish to stop Solarized from displaying bold, underlined or
|
||||
italicized typefaces, simply assign a zero value to the appropriate
|
||||
variable, for example: `let g:solarized_italic=0`
|
||||
|
||||
------------------------------------------------
|
||||
g:solarized_contrast = "normal"| "high" or "low"
|
||||
g:solarized_contrast = "normal"| "high" or "low" *'solarized_contrast'*
|
||||
------------------------------------------------
|
||||
Stick with normal! It's been carefully tested. Setting this option to high
|
||||
or low does use the same Solarized palette but simply shifts some values up
|
||||
or down in order to expand or compress the tonal range displayed.
|
||||
|
||||
------------------------------------------------
|
||||
g:solarized_visibility = "normal"| "high" or "low"
|
||||
g:solarized_visibility = "normal"| "high" or "low" *'solarized_visibility'*
|
||||
------------------------------------------------
|
||||
Special characters such as trailing whitespace, tabs, newlines, when
|
||||
displayed using ":set list" can be set to one of three levels depending on
|
||||
your needs.
|
||||
|
||||
------------------------------------------------
|
||||
g:solarized_menu = 1 | 0
|
||||
g:solarized_hitrail = 0 | 1 *'solarized_hitrail'*
|
||||
------------------------------------------------
|
||||
Visibility can make listchar entities more visible, but if one has set
|
||||
cursorline on, these same listchar values standout somewhat less due to the
|
||||
background color of the cursorline. g:solarized_hitrail enables highlighting
|
||||
of trailing spaces (only one of the listchar types, but a particularly
|
||||
important one) while in the cursoline in a different manner in order to make
|
||||
them more visible. This may not work consistently as Solarized is using
|
||||
a pattern match than can be overridden by a more encompassing syntax-native
|
||||
match such as a comment line.
|
||||
|
||||
|
||||
------------------------------------------------
|
||||
g:solarized_menu = 1 | 0 *'solarized_menu'*
|
||||
------------------------------------------------
|
||||
Solarized includes a menu providing access to several of the above
|
||||
display related options, including contrast and visibility. This allows
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
'solarized_bold' solarized.txt /*'solarized_bold'*
|
||||
'solarized_contrast' solarized.txt /*'solarized_contrast'*
|
||||
'solarized_degrade' solarized.txt /*'solarized_degrade'*
|
||||
'solarized_hitrail' solarized.txt /*'solarized_hitrail'*
|
||||
'solarized_italic' solarized.txt /*'solarized_italic'*
|
||||
'solarized_menu' solarized.txt /*'solarized_menu'*
|
||||
'solarized_termcolors' solarized.txt /*'solarized_termcolors'*
|
||||
'solarized_termtrans' solarized.txt /*'solarized_termtrans'*
|
||||
'solarized_underline' solarized.txt /*'solarized_underline'*
|
||||
'solarized_visibility' solarized.txt /*'solarized_visibility'*
|
||||
before solarized.txt /*before*
|
||||
solarized solarized.txt /*solarized*
|
||||
solarized-colors solarized.txt /*solarized-colors*
|
||||
|
|
|
|||
Loading…
Reference in a new issue