Fix formats following author's request

- Stop using abbreviations and <SID>.
    - Remove duplicated codes.
    - Fix Briticism English
This commit is contained in:
TKNGUE
2015-07-27 06:01:35 +09:00
parent 90f0409675
commit eff430dd85
3 changed files with 249 additions and 449 deletions

View File

@@ -1,12 +1,209 @@
" =============================================================================
" Filename: autoload/lightline/colorscheme/papercolor.vim
" Filename: autoload/lightline/colorscheme/PaperColor.vim
" Author: TKNGUE
" License: MIT License
" Last Change: 2015-07-26 20:34
" Last Change: 2015-07-27 06:01
" =============================================================================
if &background ==# 'light'
let g:lightline#colorscheme#papercolor#palette = g:lightline#colorscheme#papercolor_light#palette
else
let g:lightline#colorscheme#papercolor#palette = g:lightline#colorscheme#papercolor_dark#palette
endif
function! s:grey_number(x)
if &t_Co == 88
if a:x < 23
return 0
elseif a:x < 69
return 1
elseif a:x < 103
return 2
elseif a:x < 127
return 3
elseif a:x < 150
return 4
elseif a:x < 173
return 5
elseif a:x < 196
return 6
elseif a:x < 219
return 7
elseif a:x < 243
return 8
else
return 9
endif
else
if a:x < 14
return 0
else
let l:n = (a:x - 8) / 10
let l:m = (a:x - 8) % 10
if l:m < 5
return l:n
else
return l:n + 1
endif
endif
endif
endfunction
" Returns the actual grey level represented by the grey index
function! s:grey_level(n)
if &t_Co == 88
if a:n == 0
return 0
elseif a:n == 1
return 46
elseif a:n == 2
return 92
elseif a:n == 3
return 115
elseif a:n == 4
return 139
elseif a:n == 5
return 162
elseif a:n == 6
return 185
elseif a:n == 7
return 208
elseif a:n == 8
return 231
else
return 255
endif
else
if a:n == 0
return 0
else
return 8 + (a:n * 10)
endif
endif
endfunction
" Returns the palette index for the given grey index
function! s:grey_color(n)
if &t_Co == 88
if a:n == 0
return 16
elseif a:n == 9
return 79
else
return 79 + a:n
endif
else
if a:n == 0
return 16
elseif a:n == 25
return 231
else
return 231 + a:n
endif
endif
endfunction
" Returns an approximate color index for the given color level
function! s:rgb_number(x)
if &t_Co == 88
if a:x < 69
return 0
elseif a:x < 172
return 1
elseif a:x < 230
return 2
else
return 3
endif
else
if a:x < 75
return 0
else
let l:n = (a:x - 55) / 40
let l:m = (a:x - 55) % 40
if l:m < 20
return l:n
else
return l:n + 1
endif
endif
endif
endfunction
" Returns the actual color level for the given color index
function! s:rgb_level(n)
if &t_Co == 88
if a:n == 0
return 0
elseif a:n == 1
return 139
elseif a:n == 2
return 205
else
return 255
endif
else
if a:n == 0
return 0
else
return 55 + (a:n * 40)
endif
endif
endfunction
" Returns the palette index for the given R/G/B color indices
function! s:rgb_color(x, y, z)
if &t_Co == 88
return 16 + (a:x * 16) + (a:y * 4) + a:z
else
return 16 + (a:x * 36) + (a:y * 6) + a:z
endif
endfunction
" Returns the palette index to approximate the given R/G/B color levels
function! s:color(r, g, b)
" Get the closest grey
let l:gx = s:grey_number(a:r)
let l:gy = s:grey_number(a:g)
let l:gz = s:grey_number(a:b)
" Get the closest color
let l:x = s:rgb_number(a:r)
let l:y = s:rgb_number(a:g)
let l:z = s:rgb_number(a:b)
if l:gx == l:gy && l:gy == l:gz
" There are two possibilities
let l:dgr = s:grey_level(l:gx) - a:r
let l:dgg = s:grey_level(l:gy) - a:g
let l:dgb = s:grey_level(l:gz) - a:b
let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
let l:dr = s:rgb_level(l:gx) - a:r
let l:dg = s:rgb_level(l:gy) - a:g
let l:db = s:rgb_level(l:gz) - a:b
let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
if l:dgrey < l:drgb
" Use the grey
return s:grey_color(l:gx)
else
" Use the color
return s:rgb_color(l:x, l:y, l:z)
endif
else
" Only one possibility
return s:rgb_color(l:x, l:y, l:z)
endif
endfunction
" Returns the palette index to approximate the '#rrggbb' hex string
function! s:rgb(rgb)
let l:r = ("0x" . strpart(a:rgb, 1, 2)) + 0
let l:g = ("0x" . strpart(a:rgb, 3, 2)) + 0
let l:b = ("0x" . strpart(a:rgb, 5, 2)) + 0
return s:color(l:r, l:g, l:b)
endfunction
function! lightline#colorscheme#PaperColor#X(color)
return [a:color, s:rgb(a:color)]
endfunction
if &background ==# 'light'
let g:lightline#colorscheme#PaperColor#palette = g:lightline#colorscheme#PaperColor_light#palette
else
let g:lightline#colorscheme#PaperColor#palette = g:lightline#colorscheme#PaperColor_dark#palette
endif

View File

@@ -1,242 +1,45 @@
" =============================================================================
" Filename: autoload/lightline/colorscheme/autoload/lightline/colorscheme/papercolor_light.vim
" Filename: autoload/lightline/colorscheme/PaperColor_dark.vim
" Author: TKNGUE
" License: MIT License
" Last Change: 2015/07/21 13:18:03
" Last Change: 2015-07-27 06:01
" =============================================================================
fun! <SID>grey_number(x) "{{{
if &t_Co == 88
if a:x < 23
return 0
elseif a:x < 69
return 1
elseif a:x < 103
return 2
elseif a:x < 127
return 3
elseif a:x < 150
return 4
elseif a:x < 173
return 5
elseif a:x < 196
return 6
elseif a:x < 219
return 7
elseif a:x < 243
return 8
else
return 9
endif
else
if a:x < 14
return 0
else
let l:n = (a:x - 8) / 10
let l:m = (a:x - 8) % 10
if l:m < 5
return l:n
else
return l:n + 1
endif
endif
endif
endfun"}}}
let s:red = lightline#colorscheme#PaperColor#X("#df0000")
let s:green = lightline#colorscheme#PaperColor#X("#008700")
let s:blue = lightline#colorscheme#PaperColor#X("#00afaf")
" Returns the actual grey level represented by the grey index
fun! <SID>grey_level(n)"{{{
if &t_Co == 88
if a:n == 0
return 0
elseif a:n == 1
return 46
elseif a:n == 2
return 92
elseif a:n == 3
return 115
elseif a:n == 4
return 139
elseif a:n == 5
return 162
elseif a:n == 6
return 185
elseif a:n == 7
return 208
elseif a:n == 8
return 231
else
return 255
endif
else
if a:n == 0
return 0
else
return 8 + (a:n * 10)
endif
endif
endfun"}}}
let s:pink = lightline#colorscheme#PaperColor#X("#afdf00")
let s:olive = lightline#colorscheme#PaperColor#X("#dfaf5f")
let s:navy = lightline#colorscheme#PaperColor#X("#df875f")
" Returns the palette index for the given grey index
fun! <SID>grey_colour(n)"{{{
if &t_Co == 88
if a:n == 0
return 16
elseif a:n == 9
return 79
else
return 79 + a:n
endif
else
if a:n == 0
return 16
elseif a:n == 25
return 231
else
return 231 + a:n
endif
endif
endfun"}}}
" Returns an approximate colour index for the given colour level
fun! <SID>rgb_number(x)"{{{
if &t_Co == 88
if a:x < 69
return 0
elseif a:x < 172
return 1
elseif a:x < 230
return 2
else
return 3
endif
else
if a:x < 75
return 0
else
let l:n = (a:x - 55) / 40
let l:m = (a:x - 55) % 40
if l:m < 20
return l:n
else
return l:n + 1
endif
endif
endif
endfun"}}}
" Returns the actual colour level for the given colour index
fun! <SID>rgb_level(n)"{{{
if &t_Co == 88
if a:n == 0
return 0
elseif a:n == 1
return 139
elseif a:n == 2
return 205
else
return 255
endif
else
if a:n == 0
return 0
else
return 55 + (a:n * 40)
endif
endif
endfun"}}}
" Returns the palette index for the given R/G/B colour indices
fun! <SID>rgb_colour(x, y, z)"{{{
if &t_Co == 88
return 16 + (a:x * 16) + (a:y * 4) + a:z
else
return 16 + (a:x * 36) + (a:y * 6) + a:z
endif
endfun"}}}
" Returns the palette index to approximate the given R/G/B colour levels
fun! <SID>colour(r, g, b)"{{{
" Get the closest grey
let l:gx = <SID>grey_number(a:r)
let l:gy = <SID>grey_number(a:g)
let l:gz = <SID>grey_number(a:b)
" Get the closest colour
let l:x = <SID>rgb_number(a:r)
let l:y = <SID>rgb_number(a:g)
let l:z = <SID>rgb_number(a:b)
if l:gx == l:gy && l:gy == l:gz
" There are two possibilities
let l:dgr = <SID>grey_level(l:gx) - a:r
let l:dgg = <SID>grey_level(l:gy) - a:g
let l:dgb = <SID>grey_level(l:gz) - a:b
let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
let l:dr = <SID>rgb_level(l:gx) - a:r
let l:dg = <SID>rgb_level(l:gy) - a:g
let l:db = <SID>rgb_level(l:gz) - a:b
let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
if l:dgrey < l:drgb
" Use the grey
return <SID>grey_colour(l:gx)
else
" Use the colour
return <SID>rgb_colour(l:x, l:y, l:z)
endif
else
" Only one possibility
return <SID>rgb_colour(l:x, l:y, l:z)
endif
endfun"}}}
" Returns the palette index to approximate the '#rrggbb' hex string
fun! <SID>rgb(rgb)"{{{
let l:r = ("0x" . strpart(a:rgb, 1, 2)) + 0
let l:g = ("0x" . strpart(a:rgb, 3, 2)) + 0
let l:b = ("0x" . strpart(a:rgb, 5, 2)) + 0
return <SID>colour(l:r, l:g, l:b)
endfun"}}}
fun! <SID>X(color)"{{{
return [a:color, <SID>rgb(a:color)]
endfun"}}}
let s:red = <SID>X("#df0000")
let s:green = <SID>X("#008700")
let s:blue = <SID>X("#00afaf")
let s:pink = <SID>X("#afdf00")
let s:olive = <SID>X("#dfaf5f")
let s:navy = <SID>X("#df875f")
let s:orange = <SID>X("#d75f00")
let s:purple = <SID>X("#8959a8")
let s:aqua = <SID>X("#3e999f")
let s:orange = lightline#colorscheme#PaperColor#X("#d75f00")
let s:purple = lightline#colorscheme#PaperColor#X("#8959a8")
let s:aqua = lightline#colorscheme#PaperColor#X("#3e999f")
" Basics:
let s:foreground = <SID>X("#d0d0d0")
let s:background = <SID>X("#444444")
let s:window = <SID>X("#efefef")
let s:status = <SID>X("#c6c6c6")
let s:error = <SID>X("#5f0000")
let s:foreground = lightline#colorscheme#PaperColor#X("#d0d0d0")
let s:background = lightline#colorscheme#PaperColor#X("#444444")
let s:window = lightline#colorscheme#PaperColor#X("#efefef")
let s:status = lightline#colorscheme#PaperColor#X("#c6c6c6")
let s:error = lightline#colorscheme#PaperColor#X("#5f0000")
" Tabline:
let s:tabline_bg = <SID>X("#3a3a3a")
let s:tabline_active_fg = <SID>X("#1c1c1c")
let s:tabline_active_bg = <SID>X("#00afaf")
let s:tabline_inactive_fg = <SID>X("#c6c6c6")
let s:tabline_inactive_bg = <SID>X("#585858")
let s:tabline_bg = lightline#colorscheme#PaperColor#X("#3a3a3a")
let s:tabline_active_fg = lightline#colorscheme#PaperColor#X("#1c1c1c")
let s:tabline_active_bg = lightline#colorscheme#PaperColor#X("#00afaf")
let s:tabline_inactive_fg = lightline#colorscheme#PaperColor#X("#c6c6c6")
let s:tabline_inactive_bg = lightline#colorscheme#PaperColor#X("#585858")
" Statusline:
let s:statusline_active_fg = <SID>X("#1c1c1c")
let s:statusline_active_bg = <SID>X("#5f8787")
let s:statusline_inactive_fg = <SID>X("#c6c6c6")
let s:statusline_inactive_bg = <SID>X("#444444")
let s:statusline_active_fg = lightline#colorscheme#PaperColor#X("#1c1c1c")
let s:statusline_active_bg = lightline#colorscheme#PaperColor#X("#5f8787")
let s:statusline_inactive_fg = lightline#colorscheme#PaperColor#X("#c6c6c6")
let s:statusline_inactive_bg = lightline#colorscheme#PaperColor#X("#444444")
" Visual:
let s:visual_fg = <SID>X("#000000")
let s:visual_bg = <SID>X("#8787af")
let s:visual_fg = lightline#colorscheme#PaperColor#X("#000000")
let s:visual_bg = lightline#colorscheme#PaperColor#X("#8787af")
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:p.normal.left = [ [ s:foreground, s:background ], [ s:statusline_active_fg, s:status ], [ s:statusline_active_fg, s:statusline_active_bg ] ]
@@ -254,4 +57,4 @@ let s:p.tabline.middle = [ [s:tabline_bg, s:tabline_bg]]
let s:p.tabline.right = copy(s:p.normal.right)
let s:p.normal.error = [ [ s:background, s:error ] ]
let g:lightline#colorscheme#papercolor_dark#palette = lightline#colorscheme#flatten(s:p)
let g:lightline#colorscheme#PaperColor_dark#palette = lightline#colorscheme#flatten(s:p)

View File

@@ -1,226 +1,26 @@
" =============================================================================
" Filename: autoload/lightline/colorscheme/autoload/lightline/colorscheme/papercolor_light.vim
" Filename: autoload/lightline/colorscheme/PaperColor_light.vim
" Author: TKNGUE
" License: MIT License
" Last Change: 2015/07/21 13:18:03
" Last Change: 2015-07-27 06:010
" =============================================================================
fun! <SID>grey_number(x) "{{{
if &t_Co == 88
if a:x < 23
return 0
elseif a:x < 69
return 1
elseif a:x < 103
return 2
elseif a:x < 127
return 3
elseif a:x < 150
return 4
elseif a:x < 173
return 5
elseif a:x < 196
return 6
elseif a:x < 219
return 7
elseif a:x < 243
return 8
else
return 9
endif
else
if a:x < 14
return 0
else
let l:n = (a:x - 8) / 10
let l:m = (a:x - 8) % 10
if l:m < 5
return l:n
else
return l:n + 1
endif
endif
endif
endfun"}}}
" Returns the actual grey level represented by the grey index
fun! <SID>grey_level(n)"{{{
if &t_Co == 88
if a:n == 0
return 0
elseif a:n == 1
return 46
elseif a:n == 2
return 92
elseif a:n == 3
return 115
elseif a:n == 4
return 139
elseif a:n == 5
return 162
elseif a:n == 6
return 185
elseif a:n == 7
return 208
elseif a:n == 8
return 231
else
return 255
endif
else
if a:n == 0
return 0
else
return 8 + (a:n * 10)
endif
endif
endfun"}}}
" Returns the palette index for the given grey index
fun! <SID>grey_colour(n)"{{{
if &t_Co == 88
if a:n == 0
return 16
elseif a:n == 9
return 79
else
return 79 + a:n
endif
else
if a:n == 0
return 16
elseif a:n == 25
return 231
else
return 231 + a:n
endif
endif
endfun"}}}
" Returns an approximate colour index for the given colour level
fun! <SID>rgb_number(x)"{{{
if &t_Co == 88
if a:x < 69
return 0
elseif a:x < 172
return 1
elseif a:x < 230
return 2
else
return 3
endif
else
if a:x < 75
return 0
else
let l:n = (a:x - 55) / 40
let l:m = (a:x - 55) % 40
if l:m < 20
return l:n
else
return l:n + 1
endif
endif
endif
endfun"}}}
" Returns the actual colour level for the given colour index
fun! <SID>rgb_level(n)"{{{
if &t_Co == 88
if a:n == 0
return 0
elseif a:n == 1
return 139
elseif a:n == 2
return 205
else
return 255
endif
else
if a:n == 0
return 0
else
return 55 + (a:n * 40)
endif
endif
endfun"}}}
" Returns the palette index for the given R/G/B colour indices
fun! <SID>rgb_colour(x, y, z)"{{{
if &t_Co == 88
return 16 + (a:x * 16) + (a:y * 4) + a:z
else
return 16 + (a:x * 36) + (a:y * 6) + a:z
endif
endfun"}}}
" Returns the palette index to approximate the given R/G/B colour levels
fun! <SID>colour(r, g, b)"{{{
" Get the closest grey
let l:gx = <SID>grey_number(a:r)
let l:gy = <SID>grey_number(a:g)
let l:gz = <SID>grey_number(a:b)
" Get the closest colour
let l:x = <SID>rgb_number(a:r)
let l:y = <SID>rgb_number(a:g)
let l:z = <SID>rgb_number(a:b)
if l:gx == l:gy && l:gy == l:gz
" There are two possibilities
let l:dgr = <SID>grey_level(l:gx) - a:r
let l:dgg = <SID>grey_level(l:gy) - a:g
let l:dgb = <SID>grey_level(l:gz) - a:b
let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
let l:dr = <SID>rgb_level(l:gx) - a:r
let l:dg = <SID>rgb_level(l:gy) - a:g
let l:db = <SID>rgb_level(l:gz) - a:b
let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
if l:dgrey < l:drgb
" Use the grey
return <SID>grey_colour(l:gx)
else
" Use the colour
return <SID>rgb_colour(l:x, l:y, l:z)
endif
else
" Only one possibility
return <SID>rgb_colour(l:x, l:y, l:z)
endif
endfun"}}}
" Returns the palette index to approximate the '#rrggbb' hex string
fun! <SID>rgb(rgb)"{{{
let l:r = ("0x" . strpart(a:rgb, 1, 2)) + 0
let l:g = ("0x" . strpart(a:rgb, 3, 2)) + 0
let l:b = ("0x" . strpart(a:rgb, 5, 2)) + 0
return <SID>colour(l:r, l:g, l:b)
endfun"}}}
fun! <SID>X(color)"{{{
return [a:color, <SID>rgb(a:color)]
endfun"}}}
let s:red = <SID>X("#df0000") "Include/Exception
let s:green = <SID>X("#008700") "Boolean/Special
let s:blue = <SID>X("#4271ae") "Keyword
let s:pink = <SID>X("#d7005f") "Type
let s:olive = <SID>X("#718c00") "String
let s:navy = <SID>X("#005f87") "StorageClass
let s:orange = <SID>X("#d75f00") "Number
let s:purple = <SID>X("#8959a8") "Repeat/Conditional
let s:aqua = <SID>X("#3e999f") "Operator/Delimiter
let s:red = lightline#colorscheme#PaperColor#X("#df0000") "Include/Exception
let s:green = lightline#colorscheme#PaperColor#X("#008700") "Boolean/Special
let s:blue = lightline#colorscheme#PaperColor#X("#4271ae") "Keyword
let s:pink = lightline#colorscheme#PaperColor#X("#d7005f") "Type
let s:olive = lightline#colorscheme#PaperColor#X("#718c00") "String
let s:navy = lightline#colorscheme#PaperColor#X("#005f87") "StorageClass
let s:orange = lightline#colorscheme#PaperColor#X("#d75f00") "Number
let s:purple = lightline#colorscheme#PaperColor#X("#8959a8") "Repeat/Conditional
let s:aqua = lightline#colorscheme#PaperColor#X("#3e999f") "Operator/Delimiter
" Basics:
let s:foreground = <SID>X("#4d4d4c")
let s:background = <SID>X("#F5F5F5")
let s:window = <SID>X("#efefef")
let s:foreground = lightline#colorscheme#PaperColor#X("#4d4d4c")
let s:background = lightline#colorscheme#PaperColor#X("#F5F5F5")
let s:window = lightline#colorscheme#PaperColor#X("#efefef")
let s:status = s:aqua
let s:error = <SID>X("#ffafdf")
let s:error = lightline#colorscheme#PaperColor#X("#ffafdf")
" Tabline:
let s:tabline_bg = s:navy
@@ -233,7 +33,7 @@ let s:tabline_inactive_bg = s:aqua
let s:statusline_active_fg = s:window
let s:statusline_active_bg = s:navy
let s:statusline_inactive_fg = s:foreground
let s:statusline_inactive_bg = <SID>X("#dadada")
let s:statusline_inactive_bg = lightline#colorscheme#PaperColor#X("#dadada")
" Visual:
let s:visual_fg = s:background
@@ -256,4 +56,4 @@ let s:p.tabline.right = copy(s:p.normal.right)
let s:p.normal.error = [ [ s:background, s:error ] ]
let s:p.normal.warning = [ [ s:background, s:olive ] ]
let g:lightline#colorscheme#papercolor_light#palette = lightline#colorscheme#flatten(s:p)
let g:lightline#colorscheme#PaperColor_light#palette = lightline#colorscheme#flatten(s:p)