From 37435aa623032ece5948a36de49c3a10b191800b Mon Sep 17 00:00:00 2001
From: morhetz <morhetz@gmail.com>
Date: Fri, 13 Dec 2013 02:13:56 +0400
Subject: [PATCH] Introduced contrast option

---
 README.md                 |   5 +++++
 colors/.gruvbox.vim.swo   | Bin 0 -> 16384 bytes
 colors/gruvbox.vim        |  20 ++++++++++++++++++++
 gruvbox_256palette.sh     |  18 ++++++++++++++++++
 gruvbox_256palette_osx.sh |  18 ++++++++++++++++++
 5 files changed, 61 insertions(+)
 create mode 100644 colors/.gruvbox.vim.swo

diff --git a/README.md b/README.md
index b97dd657..cb57ba49 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ Screenshots
 Features
 --------
 
+* Lots of style-customization options (contrast, color invertion, italics usage etc.)
 * Extended filetype highlighting: Html, Vim, Clojure
 * Supported plugins: [EasyMotion][], [Indent Guides][], [Rainbow Parentheses][], [Airline][], [GitGutter][], [Signify][], [ShowMarks][], [Signature][], [Syntastic][]
 
@@ -126,6 +127,10 @@ default: `256`
 
 [4]: https://github.com/morhetz/gruvbox/issues/4
 
+### g:gruvbox_contrast
+Possible values is `soft`, `medium` and `hard`.
+default: `medium`
+
 ### g:gruvbox_hls_cursor
 Changes cursor background while search is highlighted. Possible values are any of gruvbox palette.  
 default: `orange`
diff --git a/colors/.gruvbox.vim.swo b/colors/.gruvbox.vim.swo
new file mode 100644
index 0000000000000000000000000000000000000000..d2204d5d550cc9a50e350c33fb877f56714f0d6f
GIT binary patch
literal 16384
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
PUXei9w`jkj*Jl3%71Y>p

literal 0
HcmV?d00001

diff --git a/colors/gruvbox.vim b/colors/gruvbox.vim
index 267efcf8..ebc5f2ce 100644
--- a/colors/gruvbox.vim
+++ b/colors/gruvbox.vim
@@ -69,6 +69,10 @@ if !exists('g:gruvbox_invert_selection')
 	let g:gruvbox_invert_selection=1
 endif
 
+if !exists('g:gruvbox_contrast')
+	let g:gruvbox_contrast='medium'
+endif
+
 let s:is_dark=(&background == 'dark')
 
 " }}}
@@ -113,6 +117,14 @@ if s:is_dark
 		let s:gb.aqua   = ['8ec07c', 14]
 		let s:gb.light1 = ['ebdbb2', 15]
 	endif
+
+	if g:gruvbox_contrast == 'soft'
+		let s:gb.dark0  = ['32302f', 236]     " 50-48-47
+	endif
+
+	if g:gruvbox_contrast == 'hard'
+		let s:gb.dark0  = ['1d2021', 234]     " 29-32-33
+	endif
 else
 	let s:gb.dark0  = ['fdf4c1', 229]     " 253-244-193
 	let s:gb.dark1  = ['ebdbb2', 223]     " 235-219-178
@@ -150,6 +162,14 @@ else
 		let s:gb.aqua   = ['427b58', 14]
 		let s:gb.light1 = ['3c3836', 15]
 	endif
+
+	if g:gruvbox_contrast == 'soft'
+		let s:gb.dark0  = ['f4e8ba', 228]     " 244-232-186
+	endif
+
+	if g:gruvbox_contrast == 'hard'
+		let s:gb.dark0  = ['ffffc8', 230]     " 255-255-200
+	endif
 endif
 
 " }}}
diff --git a/gruvbox_256palette.sh b/gruvbox_256palette.sh
index 3ff41163..7def0259 100755
--- a/gruvbox_256palette.sh
+++ b/gruvbox_256palette.sh
@@ -2,6 +2,9 @@
 
 if [ "${TERM%%-*}" = "screen" ]; then
 	if [ -n "$TMUX" ]; then
+		echo -ne "\ePtmux;\e\e]4;236;rgb:32/30/2f\a\e\\"
+		echo -ne "\ePtmux;\e\e]4;234;rgb:1d/20/21\a\e\\"
+
 		echo -ne "\ePtmux;\e\e]4;235;rgb:28/28/28\a\e\\"
 		echo -ne "\ePtmux;\e\e]4;237;rgb:3c/38/36\a\e\\"
 		echo -ne "\ePtmux;\e\e]4;239;rgb:50/49/45\a\e\\"
@@ -11,6 +14,9 @@ if [ "${TERM%%-*}" = "screen" ]; then
 		echo -ne "\ePtmux;\e\e]4;244;rgb:92/83/74\a\e\\"
 		echo -ne "\ePtmux;\e\e]4;245;rgb:92/83/74\a\e\\"
 
+		echo -ne "\ePtmux;\e\e]4;228;rgb:f4/e8/ba\a\e\\"
+		echo -ne "\ePtmux;\e\e]4;230;rgb:ff/ff/c8\a\e\\"
+
 		echo -ne "\ePtmux;\e\e]4;229;rgb:fd/f4/c1\a\e\\"
 		echo -ne "\ePtmux;\e\e]4;223;rgb:eb/db/b2\a\e\\"
 		echo -ne "\ePtmux;\e\e]4;250;rgb:d5/c4/a1\a\e\\"
@@ -33,6 +39,9 @@ if [ "${TERM%%-*}" = "screen" ]; then
 		echo -ne "\ePtmux;\e\e]4;66;rgb:42/7b/58\a\e\\"
 		echo -ne "\ePtmux;\e\e]4;130;rgb:af/3a/03\a\e\\"
 	else
+		echo -ne "\eP\e]4;236;rgb:32/30/2f\a\e\\"
+		echo -ne "\eP\e]4;234;rgb:1d/20/21\a\e\\"
+
 		echo -ne "\eP\e]4;235;rgb:28/28/28\a\e\\"
 		echo -ne "\eP\e]4;237;rgb:3c/38/36\a\e\\"
 		echo -ne "\eP\e]4;239;rgb:50/49/45\a\e\\"
@@ -42,6 +51,9 @@ if [ "${TERM%%-*}" = "screen" ]; then
 		echo -ne "\eP\e]4;244;rgb:92/83/74\a\e\\"
 		echo -ne "\eP\e]4;245;rgb:92/83/74\a\e\\"
 
+		echo -ne "\eP\e]4;228;rgb:f4/e8/ba\a\e\\"
+		echo -ne "\eP\e]4;230;rgb:ff/ff/c8\a\e\\"
+
 		echo -ne "\eP\e]4;229;rgb:fd/f4/c1\a\e\\"
 		echo -ne "\eP\e]4;223;rgb:eb/db/b2\a\e\\"
 		echo -ne "\eP\e]4;250;rgb:d5/c4/a1\a\e\\"
@@ -65,6 +77,9 @@ if [ "${TERM%%-*}" = "screen" ]; then
 		echo -ne "\eP\e]4;130;rgb:af/3a/03\a\e\\"
 	fi
 else
+	echo -ne "\e]4;236;rgb:32/30/2f\e\\"
+	echo -ne "\e]4;234;rgb:1d/20/21\e\\"
+
 	echo -ne "\e]4;235;rgb:28/28/28\e\\"
 	echo -ne "\e]4;237;rgb:3c/38/36\e\\"
 	echo -ne "\e]4;239;rgb:50/49/45\e\\"
@@ -74,6 +89,9 @@ else
 	echo -ne "\e]4;244;rgb:92/83/74\e\\"
 	echo -ne "\e]4;245;rgb:92/83/74\e\\"
 
+	echo -ne "\e]4;228;rgb:f4/e8/ba\e\\"
+	echo -ne "\e]4;230;rgb:ff/ff/c8\e\\"
+
 	echo -ne "\e]4;229;rgb:fd/f4/c1\e\\"
 	echo -ne "\e]4;223;rgb:eb/db/b2\e\\"
 	echo -ne "\e]4;250;rgb:d5/c4/a1\e\\"
diff --git a/gruvbox_256palette_osx.sh b/gruvbox_256palette_osx.sh
index d654ff10..cc78c6ae 100755
--- a/gruvbox_256palette_osx.sh
+++ b/gruvbox_256palette_osx.sh
@@ -2,6 +2,9 @@
 
 if [ "${TERM%%-*}" = "screen" ]; then
 	if [ -n "$TMUX" ]; then
+		echo -ne "\x1bPtmux;\x1b\x1b]4;236;rgb:32/30/2f\a\x1b\\"
+		echo -ne "\x1bPtmux;\x1b\x1b]4;234;rgb:1d/20/21\a\x1b\\"
+
 		echo -ne "\x1bPtmux;\x1b\x1b]4;235;rgb:28/28/28\a\x1b\\"
 		echo -ne "\x1bPtmux;\x1b\x1b]4;237;rgb:3c/38/36\a\x1b\\"
 		echo -ne "\x1bPtmux;\x1b\x1b]4;239;rgb:50/49/45\a\x1b\\"
@@ -11,6 +14,9 @@ if [ "${TERM%%-*}" = "screen" ]; then
 		echo -ne "\x1bPtmux;\x1b\x1b]4;244;rgb:92/83/74\a\x1b\\"
 		echo -ne "\x1bPtmux;\x1b\x1b]4;245;rgb:92/83/74\a\x1b\\"
 
+		echo -ne "\x1bPtmux;\x1b\x1b]4;228;rgb:f4/e8/ba\a\x1b\\"
+		echo -ne "\x1bPtmux;\x1b\x1b]4;230;rgb:ff/ff/c8\a\x1b\\"
+
 		echo -ne "\x1bPtmux;\x1b\x1b]4;229;rgb:fd/f4/c1\a\x1b\\"
 		echo -ne "\x1bPtmux;\x1b\x1b]4;223;rgb:eb/db/b2\a\x1b\\"
 		echo -ne "\x1bPtmux;\x1b\x1b]4;250;rgb:d5/c4/a1\a\x1b\\"
@@ -33,6 +39,9 @@ if [ "${TERM%%-*}" = "screen" ]; then
 		echo -ne "\x1bPtmux;\x1b\x1b]4;66;rgb:42/7b/58\a\x1b\\"
 		echo -ne "\x1bPtmux;\x1b\x1b]4;130;rgb:af/3a/03\a\x1b\\"
 	else
+		echo -ne "\x1bP\x1b]4;236;rgb:32/30/2f\a\x1b\\"
+		echo -ne "\x1bP\x1b]4;234;rgb:1d/20/21\a\x1b\\"
+
 		echo -ne "\x1bP\x1b]4;235;rgb:28/28/28\a\x1b\\"
 		echo -ne "\x1bP\x1b]4;237;rgb:3c/38/36\a\x1b\\"
 		echo -ne "\x1bP\x1b]4;239;rgb:50/49/45\a\x1b\\"
@@ -42,6 +51,9 @@ if [ "${TERM%%-*}" = "screen" ]; then
 		echo -ne "\x1bP\x1b]4;244;rgb:92/83/74\a\x1b\\"
 		echo -ne "\x1bP\x1b]4;245;rgb:92/83/74\a\x1b\\"
 
+		echo -ne "\x1bP\x1b]4;228;rgb:f4/e8/ba\a\x1b\\"
+		echo -ne "\x1bP\x1b]4;230;rgb:ff/ff/c8\a\x1b\\"
+
 		echo -ne "\x1bP\x1b]4;229;rgb:fd/f4/c1\a\x1b\\"
 		echo -ne "\x1bP\x1b]4;223;rgb:eb/db/b2\a\x1b\\"
 		echo -ne "\x1bP\x1b]4;250;rgb:d5/c4/a1\a\x1b\\"
@@ -65,6 +77,9 @@ if [ "${TERM%%-*}" = "screen" ]; then
 		echo -ne "\x1bP\x1b]4;130;rgb:af/3a/03\a\x1b\\"
 	fi
 else
+	echo -ne "\x1b]4;236;rgb:32/30/2f\x1b\\"
+	echo -ne "\x1b]4;234;rgb:1d/20/21\x1b\\"
+
 	echo -ne "\x1b]4;235;rgb:28/28/28\x1b\\"
 	echo -ne "\x1b]4;237;rgb:3c/38/36\x1b\\"
 	echo -ne "\x1b]4;239;rgb:50/49/45\x1b\\"
@@ -74,6 +89,9 @@ else
 	echo -ne "\x1b]4;244;rgb:92/83/74\x1b\\"
 	echo -ne "\x1b]4;245;rgb:92/83/74\x1b\\"
 
+	echo -ne "\x1b]4;228;rgb:f4/e8/ba\x1b\\"
+	echo -ne "\x1b]4;230;rgb:ff/ff/c8\x1b\\"
+
 	echo -ne "\x1b]4;229;rgb:fd/f4/c1\x1b\\"
 	echo -ne "\x1b]4;223;rgb:eb/db/b2\x1b\\"
 	echo -ne "\x1b]4;250;rgb:d5/c4/a1\x1b\\"