Merge pull request #24 from ressu/fix-22

Fix colors_name to g:colors_name instead

.hgignore

@@ -8,3 +8,4 @@ syntax: glob
 *~
 .ropeproject
 tags
+tags.bak

.hgtags

@@ -3,3 +3,6 @@
 2804e4d33d917aa2251b6d33709d17223fd5e5d0 v1.1.1
 599ba7563aa4251e5f51c3e00ed8c993fe1426c5 v1.1.2
 8c3583c971acda5cb4f034dbe643e5a9315db63b v1.2.0
+4e6ee97af8b02741af86dcb2eb3f0f4dbbcc9761 v1.3.0
+5b17fcb91dd54bff3987513ece727b45105b15fc v1.4.0
+2ef3532a6301313f323067bba6b6d445d0f332c5 v1.5.0

README.markdown

@@ -40,6 +40,37 @@ Configuration
 
 There are a few settings you can use to tweak how Bad Wolf looks.
 
+### g:badwolf\_darkgutter
+
+Determines whether the line number, sign column, and fold column are rendered
+darker than the normal background, or the same.
+
+    " Make the gutters darker than the background.
+    let g:badwolf_darkgutter = 1
+
+Default: `0` (off, gutters are the same as the background)
+
+### g:badwolf\_tabline
+
+Determines how light to render the background of the tab line (the line at the
+top of the screen containing the various tabs (only in console mode)).
+
+Can be set to `0`, `1`, `2`, or `3`.
+
+    " Make the tab line darker than the background.
+    let g:badwolf_tabline = 0
+
+    " Make the tab line the same color as the background.
+    let g:badwolf_tabline = 1
+
+    " Make the tab line lighter than the background.
+    let g:badwolf_tabline = 2
+
+    " Make the tab line much lighter than the background.
+    let g:badwolf_tabline = 3
+
+Default: `1` (same color as the background)
+
 ### g:badwolf\_html\_link\_underline
 
 Determines whether text inside `a` tags in HTML files will be underlined.
@@ -49,6 +80,15 @@ Determines whether text inside `a` tags in HTML files will be underlined.
 
 Default: `1` (on)
 
+### g:badwolf\_css\_props\_highlight
+
+Determines whether CSS properties should be highlighted.
+
+    " Turn on CSS properties highlighting
+    let g:badwolf_css_props_highlight = 1
+
+Default: `0` (off)
+
 Contributing
 ------------
 

colors/badwolf.vim

@@ -41,12 +41,16 @@ if exists("syntax_on")
     syntax reset
 endif
 
-let colors_name = "badwolf"
+let g:colors_name = "badwolf"
 
 if !exists("g:badwolf_html_link_underline") " {{{
     let g:badwolf_html_link_underline = 1
 endif " }}}
 
+if !exists("g:badwolf_css_props_highlight") " {{{
+    let g:badwolf_css_props_highlight = 0
+endif " }}}
+
 " }}}
 " Palette {{{
 
@@ -150,6 +154,22 @@ else
     let s:gutter = 'blackgravel'
 endif
 
+if exists('g:badwolf_tabline')
+    if g:badwolf_tabline == 0
+        let s:tabline = 'blackestgravel'
+    elseif  g:badwolf_tabline == 1
+        let s:tabline = 'blackgravel'
+    elseif  g:badwolf_tabline == 2
+        let s:tabline = 'darkgravel'
+    elseif  g:badwolf_tabline == 3
+        let s:tabline = 'deepgravel'
+    else
+        let s:tabline = 'blackestgravel'
+    endif
+else
+    let s:tabline = 'blackgravel'
+endif
+
 " }}}
 
 " Actual colorscheme ----------------------------------------------------------
@@ -167,6 +187,10 @@ call s:HL('CursorLine',   '', 'darkgravel', 'none')
 call s:HL('CursorColumn', '', 'darkgravel')
 call s:HL('ColorColumn',  '', 'darkgravel')
 
+call s:HL('TabLine', 'plain', s:tabline, 'none')
+call s:HL('TabLineFill', 'plain', s:tabline, 'none')
+call s:HL('TabLineSel', 'coal', 'tardis', 'none')
+
 call s:HL('MatchParen', 'dalespale', 'darkgravel', 'bold')
 
 call s:HL('NonText',    'deepgravel', 'bg')
@@ -296,7 +320,7 @@ call s:HL('DiffText',   'snow', 'deepergravel', 'bold')
 
 if has("spell")
     call s:HL('SpellCap', 'dalespale', 'bg', 'undercurl,bold', 'dalespale')
-    call s:HL('SpellBad', '', '', 'undercurl', 'dalespale')
+    call s:HL('SpellBad', '', 'bg', 'undercurl', 'dalespale')
     call s:HL('SpellLocal', '', '', 'undercurl', 'dalespale')
     call s:HL('SpellRare', '', '', 'undercurl', 'dalespale')
 endif
@@ -355,7 +379,11 @@ call s:HL('EasyMotionShade',  'deepgravel', 'bg')
 " from my Vimrc.
 call s:HL('InterestingWord1', 'coal', 'orange')
 call s:HL('InterestingWord2', 'coal', 'lime')
-call s:HL('InterestingWord3', 'coal', 'taffy')
+call s:HL('InterestingWord3', 'coal', 'saltwatertaffy')
+call s:HL('InterestingWord4', 'coal', 'toffee')
+call s:HL('InterestingWord5', 'coal', 'dress')
+call s:HL('InterestingWord6', 'coal', 'taffy')
+
 
 " }}}
 " Makegreen {{{
@@ -363,6 +391,26 @@ call s:HL('InterestingWord3', 'coal', 'taffy')
 " hi GreenBar term=reverse ctermfg=white ctermbg=green guifg=coal guibg=#9edf1c
 " hi RedBar   term=reverse ctermfg=white ctermbg=red guifg=white guibg=#C50048
 
+" }}}
+" Rainbow Parentheses {{{
+
+call s:HL('level16c', 'mediumgravel',   '', 'bold')
+call s:HL('level15c', 'dalespale',      '', '')
+call s:HL('level14c', 'dress',          '', '')
+call s:HL('level13c', 'orange',         '', '')
+call s:HL('level12c', 'tardis',         '', '')
+call s:HL('level11c', 'lime',           '', '')
+call s:HL('level10c', 'toffee',         '', '')
+call s:HL('level9c',  'saltwatertaffy', '', '')
+call s:HL('level8c',  'coffee',         '', '')
+call s:HL('level7c',  'dalespale',      '', '')
+call s:HL('level6c',  'dress',          '', '')
+call s:HL('level5c',  'orange',         '', '')
+call s:HL('level4c',  'tardis',         '', '')
+call s:HL('level3c',  'lime',           '', '')
+call s:HL('level2c',  'toffee',         '', '')
+call s:HL('level1c',  'saltwatertaffy', '', '')
+
 " }}}
 " ShowMarks {{{
 
@@ -394,14 +442,29 @@ call s:HL('clojureParen0', 'lightgravel', '', 'none')
 
 call s:HL('clojureAnonArg', 'snow', '', 'bold')
 
+" }}}
+" Common Lisp {{{
+
+call s:HL('lispFunc',           'lime', '', 'none')
+call s:HL('lispVar',            'orange', '', 'bold')
+call s:HL('lispEscapeSpecial',  'orange', '', 'none')
+
 " }}}
 " CSS {{{
 
-call s:HL('cssColorProp', 'fg', '', 'none')
-call s:HL('cssBoxProp', 'fg', '', 'none')
-call s:HL('cssTextProp', 'fg', '', 'none')
-call s:HL('cssRenderProp', 'fg', '', 'none')
-call s:HL('cssGeneratedContentProp', 'fg', '', 'none')
+if g:badwolf_css_props_highlight
+    call s:HL('cssColorProp', 'taffy', '', 'none')
+    call s:HL('cssBoxProp', 'taffy', '', 'none')
+    call s:HL('cssTextProp', 'taffy', '', 'none')
+    call s:HL('cssRenderProp', 'taffy', '', 'none')
+    call s:HL('cssGeneratedContentProp', 'taffy', '', 'none')
+else
+    call s:HL('cssColorProp', 'fg', '', 'none')
+    call s:HL('cssBoxProp', 'fg', '', 'none')
+    call s:HL('cssTextProp', 'fg', '', 'none')
+    call s:HL('cssRenderProp', 'fg', '', 'none')
+    call s:HL('cssGeneratedContentProp', 'fg', '', 'none')
+end
 
 call s:HL('cssValueLength', 'toffee', '', 'bold')
 call s:HL('cssColor', 'toffee', '', 'bold')
@@ -463,11 +526,44 @@ call s:HL('javaCommentTitle', 'gravel', '')
 call s:HL('javaDocTags', 'snow', '', 'none')
 call s:HL('javaDocParam', 'dalespale', '', '')
 
+" }}}
+" LaTeX {{{
+
+call s:HL('texStatement', 'tardis', '', 'none')
+call s:HL('texMathZoneX', 'orange', '', 'none')
+call s:HL('texMathZoneA', 'orange', '', 'none')
+call s:HL('texMathZoneB', 'orange', '', 'none')
+call s:HL('texMathZoneC', 'orange', '', 'none')
+call s:HL('texMathZoneD', 'orange', '', 'none')
+call s:HL('texMathZoneE', 'orange', '', 'none')
+call s:HL('texMathZoneV', 'orange', '', 'none')
+call s:HL('texMathZoneX', 'orange', '', 'none')
+call s:HL('texMath', 'orange', '', 'none')
+call s:HL('texMathMatcher', 'orange', '', 'none')
+call s:HL('texRefLabel', 'dirtyblonde', '', 'none')
+call s:HL('texRefZone', 'lime', '', 'none')
+call s:HL('texComment', 'darkroast', '', 'none')
+call s:HL('texDelimiter', 'orange', '', 'none')
+call s:HL('texZone', 'brightgravel', '', 'none')
+
+augroup badwolf_tex
+    au!
+
+    au BufRead,BufNewFile *.tex syn region texMathZoneV start="\\(" end="\\)\|%stopzone\>" keepend contains=@texMathZoneGroup
+    au BufRead,BufNewFile *.tex syn region texMathZoneX start="\$" skip="\\\\\|\\\$" end="\$\|%stopzone\>" keepend contains=@texMathZoneGroup
+augroup END
+
 " }}}
 " LessCSS {{{
 
 call s:HL('lessVariable', 'lime', '', 'none')
 
+" }}}
+" Lispyscript {{{
+
+call s:HL('lispyscriptDefMacro', 'lime', '', '')
+call s:HL('lispyscriptRepeat', 'dress', '', 'none')
+
 " }}}
 " Mail {{{
 

contrib/badwolf-theme.el

@@ -0,0 +1,108 @@
+(deftheme badwolf "Badwolf color Theme")
+
+(let ((class '((class color) (min-colors 89)))
+     ;;Badwolf pallete
+    (bwc-plain "#f8f6f2")
+    (bwc-snow "#ffffff")
+    (bwc-coal "#000000")
+
+    (bwc-brightgravel "#d9cec3")
+    (bwc-lightgravel "#998f84")
+    (bwc-gravel "#857f78")
+    (bwc-mediumgravel "#666462")
+    (bwc-deepgravel "#45413b")
+    (bwc-deepergravel "#35322d")
+    (bwc-darkgravel "#242321")
+    (bwc-blackgravel "#1c1b1a")
+    (bwc-blackestgravel "#141413")
+
+    (bwc-dalespale "#fade3e")
+    (bwc-dirtyblonde "#f4cf86")
+    ; (bwc-taffy "#ff2c4b")
+    (bwc-taffy "#ff0208")
+    (bwc-saltwatertaffy "#8cffba")
+    (bwc-tardis "#0a9dff")
+    (bwc-orange "#ffa724")
+    (bwc-lime "#aeee00")
+    (bwc-dress "#ff9eb8")
+    (bwc-toffee "#b88853")
+    (bwc-coffee "#c7915b")
+    (bwc-darkroast "#88633f")
+    )
+
+  ;; theme faces
+  (custom-theme-set-faces
+   'badwolf
+   `(default ((t (:inherit nil :foreground ,bwc-plain :background ,bwc-blackestgravel))))
+   `(cursor ((t (:background ,bwc-tardis))))
+   `(region ((t (:foreground nil :background ,bwc-mediumgravel ))))
+   `(fringe ((t (:background ,bwc-blackestgravel))))
+
+   `(minibuffer-prompt ((t (:foreground ,bwc-lime))))
+   `(link ((t (:foreground ,bwc-lightgravel :underline t))))
+   `(link-visited ((t (:inherit link :foreground ,bwc-orange))))
+
+   `(highlight ((t (:foreground ,bwc-coal :background ,bwc-dalespale))))
+   `(hl-line ((t (:inherit nil :background ,bwc-darkgravel))))
+
+   `(linum ((t (:foreground ,bwc-mediumgravel))))
+
+   `(isearch ((t (:foreground ,bwc-coal :background ,bwc-dalespale :weight bold))))
+   `(lazy-highlight ((t (:foreground ,bwc-coal :background, bwc-dalespale :weight bold))))
+
+   `(mode-line ((t (:box (:line-width -1 :style released-button) :foreground ,bwc-brightgravel :background ,bwc-darkgravel))))
+   `(mode-line-inactive ((t (:box (:line-width -1 :style released-button) :foreground ,bwc-snow :background ,bwc-deepgravel))))
+
+
+   `(font-lock-comment-face ((t (:foreground ,bwc-lightgravel))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,bwc-lightgravel))))
+   `(font-lock-doc-face ((t (:foreground ,bwc-snow))))
+   `(font-lock-string-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(font-lock-function-name-face ((t (:foreground ,bwc-orange))))
+   `(font-lock-variable-name-face ((t (:foreground ,bwc-dress))))
+   `(font-lock-builtin-face ((t (:foreground ,bwc-taffy :weight bold))))
+   `(font-lock-keyword-face ((t (:foreground ,bwc-taffy :weight bold))))
+   `(font-lock-type-face ((t (:foreground ,bwc-dress))))
+   `(font-lock-constant-face ((t (:foreground ,bwc-orange))))
+   `(font-lock-warning-face ((t (:foreground ,bwc-dress :weight bold))))
+
+  `(show-paren-match ((t (:background ,bwc-tardis :weight bold))))
+  `(show-paren-mismatch ((t (:background ,bwc-taffy :weight bold))))
+
+    ;; rainbow-delimiters
+   `(rainbow-delimiters-depth-1-face ((t (:foreground ,bwc-lightgravel))))
+   `(rainbow-delimiters-depth-2-face ((t (:foreground ,bwc-orange))))
+   `(rainbow-delimiters-depth-3-face ((t (:foreground ,bwc-saltwatertaffy))))
+   `(rainbow-delimiters-depth-4-face ((t (:foreground ,bwc-dress))))
+   `(rainbow-delimiters-depth-5-face ((t (:foreground ,bwc-coffee))))
+   `(rainbow-delimiters-depth-6-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(rainbow-delimiters-depth-7-face ((t (:foreground ,bwc-orange))))
+   `(rainbow-delimiters-depth-8-face ((t (:foreground ,bwc-saltwatertaffy)))
+   `(rainbow-delimiters-depth-9-face ((t (:foreground ,bwc-dress))))
+   `(rainbow-delimiters-depth-10-face ((t (:foreground ,bwc-coffee))))
+   `(rainbow-delimiters-depth-11-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(rainbow-delimiters-unmatched-face ((t (:foreground "red"))))
+
+
+
+
+   ))
+
+    (custom-set-faces
+     `(ein:cell-input-area ((t (:background ,bwc-blackestgravel :inherit nil))))
+     `(ein:cell-input-prompt ((t (:foreground ,bwc-orange :background nil :inherit nil))))
+     `(ein:cell-output-prompt ((t (:foreground ,bwc-taffy :background nil :inherit nil))))
+     '(mumamo-background-chunk-major ((((class color) (min-colors 88) (background dark)) nil)))
+
+     `(ac-candidate-face ((t (:background ,bwc-lightgravel))))
+     `(ac-selection-face ((t (:foreground ,bwc-coal :background ,bwc-orange))))
+
+      `(flymake-errline ((t (:background nil :underline ,bwc-taffy ))))
+      `(flymake-warnline ((t (:background nil :underline ,bwc-dress ))))
+     )
+
+
+    (font-lock-add-keywords 'python-mode `(("\\<\\(import\\||from\\|except\\|finally\\|try\\|from\\|\\)\\>" 1 '(:foreground ,bwc-lime ) t)))
+  )
+
+(provide-theme 'badwolf)

contrib/badwolf.dvtcolortheme

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>DVTConsoleDebuggerInputTextColor</key>
+	<string>0.972549 0.964706 0.94902 1</string>
+	<key>DVTConsoleDebuggerInputTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleDebuggerOutputTextColor</key>
+	<string>0.972549 0.964706 0.94902 1</string>
+	<key>DVTConsoleDebuggerOutputTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleDebuggerPromptTextColor</key>
+	<string>0.0392157 0.615686 1 1</string>
+	<key>DVTConsoleDebuggerPromptTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleExectuableInputTextColor</key>
+	<string>0.972549 0.964706 0.94902 1</string>
+	<key>DVTConsoleExectuableInputTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleExectuableOutputTextColor</key>
+	<string>0.972549 0.964706 0.94902 1</string>
+	<key>DVTConsoleExectuableOutputTextFont</key>
+	<string>Monaco - 11.0</string>
+	<key>DVTConsoleTextBackgroundColor</key>
+	<string>0.138326 0.138352 0.13832 1</string>
+	<key>DVTConsoleTextInsertionPointColor</key>
+	<string>0 0 0 1</string>
+	<key>DVTConsoleTextSelectionColor</key>
+	<string>0.2 0.2 0.2 1</string>
+	<key>DVTDebuggerInstructionPointerColor</key>
+	<string>0.705792 0.8 0.544 1</string>
+	<key>DVTSourceTextBackground</key>
+	<string>0.0784314 0.0784314 0.0745098 1</string>
+	<key>DVTSourceTextBlockDimBackgroundColor</key>
+	<string>0.5 0.5 0.5 1</string>
+	<key>DVTSourceTextInsertionPointColor</key>
+	<string>0.0392157 0.615686 1 1</string>
+	<key>DVTSourceTextInvisiblesColor</key>
+	<string>0.85098 0.807843 0.764706 1</string>
+	<key>DVTSourceTextSelectionColor</key>
+	<string>0.207843 0.196078 0.176471 1</string>
+	<key>DVTSourceTextSyntaxColors</key>
+	<dict>
+		<key>xcode.syntax.attribute</key>
+		<string>1 0.619608 0.721569 1</string>
+		<key>xcode.syntax.character</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+		<key>xcode.syntax.comment</key>
+		<string>0.521569 0.498039 0.470588 1</string>
+		<key>xcode.syntax.comment.doc</key>
+		<string>0.521569 0.498039 0.470588 1</string>
+		<key>xcode.syntax.comment.doc.keyword</key>
+		<string>0.521569 0.498039 0.470588 1</string>
+		<key>xcode.syntax.identifier.class</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.identifier.class.system</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.identifier.constant</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+		<key>xcode.syntax.identifier.constant.system</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+		<key>xcode.syntax.identifier.function</key>
+		<string>1 0.654902 0.141176 1</string>
+		<key>xcode.syntax.identifier.function.system</key>
+		<string>1 0.654902 0.141176 1</string>
+		<key>xcode.syntax.identifier.macro</key>
+		<string>0.682353 0.933333 0 1</string>
+		<key>xcode.syntax.identifier.macro.system</key>
+		<string>0.682353 0.933333 0 1</string>
+		<key>xcode.syntax.identifier.type</key>
+		<string>1 0.654902 0.141176 1</string>
+		<key>xcode.syntax.identifier.type.system</key>
+		<string>1 0.654902 0.141176 1</string>
+		<key>xcode.syntax.identifier.variable</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.identifier.variable.system</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.keyword</key>
+		<string>1 0.172549 0.294118 1</string>
+		<key>xcode.syntax.number</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+		<key>xcode.syntax.plain</key>
+		<string>0.972549 0.964706 0.94902 1</string>
+		<key>xcode.syntax.preprocessor</key>
+		<string>0.682353 0.933333 0 1</string>
+		<key>xcode.syntax.string</key>
+		<string>0.956863 0.811765 0.52549 1</string>
+		<key>xcode.syntax.url</key>
+		<string>0.721569 0.533333 0.32549 1</string>
+	</dict>
+	<key>DVTSourceTextSyntaxFonts</key>
+	<dict>
+		<key>xcode.syntax.attribute</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.character</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.comment</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.comment.doc</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.comment.doc.keyword</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.class</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.class.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.constant</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.constant.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.function</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.function.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.macro</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.macro.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.type</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.type.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.variable</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.identifier.variable.system</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.keyword</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.number</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.plain</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.preprocessor</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.string</key>
+		<string>Monaco - 11.0</string>
+		<key>xcode.syntax.url</key>
+		<string>Monaco - 11.0</string>
+	</dict>
+</dict>
+</plist>

package.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-hg archive ~/Desktop/badwolf.zip -I 'colors' -I README.markdown
+hg archive ~/Desktop/badwolf.zip -I 'colors' -I README.markdown -I 'contrib'