coloration 0.3.2 → 0.3.3

data/lib/coloration/readers/textmate_theme_reader.rb

@@ -19,7 +19,9 @@ module Coloration
         self.ui = settings.delete_at(0)["settings"]
         bg = Color::RGB.from_html(ui["background"][0..6])
         ui.each do |key, value|
-          ui[key] = Color::RGBA.from_html(value, bg)
+          if value.start_with?("#")
+            ui[key] = Color::RGBA.from_html(value, bg)
+          end
         end
         ui["background"] = bg
 

data/lib/coloration/version.rb

@@ -1,3 +1,3 @@
 module Coloration
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

data/lib/coloration/writers/vim_theme_writer.rb

@@ -23,25 +23,24 @@ module Coloration
         add_line
 
         default_style = Style.new(:fg => @ui["foreground"])
-        search_style = @items["variable"] || @items["entity"] || @items["keyword"] || default_style
         border_color = @ui["background"].mix_with(@ui["foreground"], 71)
         bg_line_color = @ui["background"].mix_with(@ui["foreground"], 90)
 
         ui_mapping = {
-          "Cursor" => Style.new(:bg => @ui["caret"]),
+          "Cursor" => Style.new(:fg => @ui['background'], :bg => @ui["caret"]),
           "Visual" => Style.new(:bg => @ui["selection"]),
           "CursorLine" => Style.new(:bg => bg_line_color),
           "CursorColumn" => Style.new(:bg => bg_line_color),
           "ColorColumn" => Style.new(:bg => bg_line_color),
           "LineNr" => Style.new(:fg => @ui["foreground"].mix_with(@ui["background"], 50), :bg => bg_line_color),
           "VertSplit" => Style.new(:fg => border_color, :bg => border_color),
-          "MatchParen" => @items["keyword"],
+          "MatchParen" => Style.new(:fg => @items["keyword"].foreground, :underline => true),
           "StatusLine" => Style.new(:fg => @ui["foreground"], :bg => border_color, :bold => true),
           "StatusLineNC" => Style.new(:fg => @ui["foreground"], :bg => border_color),
           "Pmenu" => "entity.name",
           "PmenuSel" => Style.new(:bg => @ui["selection"]),
-          "IncSearch" => Style.new(:bg => search_style.foreground.mix_with(@ui["background"], 33)),
-          "Search" => Style.new(:bg => search_style.foreground.mix_with(@ui["background"], 33)),
+          "IncSearch" => Style.new(:bg => @items['string'].foreground, :fg => @ui['background']),
+          "Search" => Style.new(:underline => true),
           "Directory" => "constant.other.symbol",
           "Folded" => Style.new(:fg => @items["comment"].try(:foreground), :bg => @ui["background"]),
         }
@@ -52,6 +51,19 @@ module Coloration
 
         add_line
 
+        bg_brightness = @ui["background"].brightness
+        if bg_brightness >= 0.5
+          # from Tango palette, lighter
+          red   = Color::RGB.from_html '#ef2929'
+          green = Color::RGB.from_html '#8ae234'
+          blue  = Color::RGB.from_html '#729fcf'
+        else
+          # from Tango palette, darker
+          red   = Color::RGB.from_html '#a40000'
+          green = Color::RGB.from_html '#4e9a06'
+          blue  = Color::RGB.from_html '#204a87'
+        end
+
         items_mapping = {
           # general colors for all languages
           "Normal" => Style.new(:fg => @ui["foreground"], :bg => @ui["background"]),
@@ -63,6 +75,10 @@ module Coloration
           #"Debug" => [],
           "Define" => "keyword",
           #"Delimiter" => "meta.separator",
+          "DiffAdd" => Style.new(:bg => green.mix_with(@ui['background'], 80), :fg => @ui['foreground'], :bold => true),
+          "DiffDelete" => Style.new(:fg => red.mix_with(@ui['background'], 80)),
+          "DiffChange" => Style.new(:bg => blue.mix_with(@ui['background'], 50), :fg => @ui['foreground']),
+          "DiffText" => Style.new(:bg => blue.mix_with(@ui['background'], 100), :fg => @ui['foreground'], :bold => true),
           "ErrorMsg" => "invalid",
           "WarningMsg" => "invalid",
           #"Exception" => [],

metadata

@@ -1,77 +1,90 @@
 --- !ruby/object:Gem::Specification
 name: coloration
 version: !ruby/object:Gem::Version
-  version: 0.3.2
   prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - Marcin Kulik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-22 00:00:00.000000000 +02:00
-default_executable: 
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: textpow19
-  requirement: &70471280 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.11'
-  type: :runtime
   prerelease: false
-  version_requirements: *70471280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  name: textpow19
 - !ruby/object:Gem::Dependency
-  name: color-tools
-  requirement: &70471050 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
-  type: :runtime
   prerelease: false
-  version_requirements: *70471050
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  name: color-tools
 - !ruby/object:Gem::Dependency
-  name: plist
-  requirement: &70470820 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-  type: :runtime
   prerelease: false
-  version_requirements: *70470820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  name: plist
 description: Color scheme converters for vim, textmate, kate/kwrite, jedit
 email: marcin.kulik@gmail.com
 executables:
-- tm2vim
 - tm2katepart
+- tm2vim
 - tm2jedit
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/tm2vim
 - bin/tm2katepart
+- bin/tm2vim
 - bin/tm2jedit
-- lib/coloration/extensions.rb
+- lib/coloration.rb
+- lib/coloration/version.rb
 - lib/coloration/readers/textmate_theme_reader.rb
-- lib/coloration/converters/textmate2katepart.rb
+- lib/coloration/extensions.rb
+- lib/coloration/style.rb
+- lib/coloration/color_rgba.rb
 - lib/coloration/converters/textmate2vim.rb
 - lib/coloration/converters/textmate2jedit.rb
+- lib/coloration/converters/textmate2katepart.rb
+- lib/coloration/abstract_converter.rb
 - lib/coloration/writers/katepart_theme_writer.rb
-- lib/coloration/writers/vim_theme_writer.rb
 - lib/coloration/writers/jedit_theme_writer.rb
-- lib/coloration/abstract_converter.rb
-- lib/coloration/version.rb
-- lib/coloration/color_rgba.rb
-- lib/coloration/style.rb
-- lib/coloration.rb
+- lib/coloration/writers/vim_theme_writer.rb
 - README.md
-has_rdoc: true
 homepage: http://github.com/sickill/coloration
 licenses: []
 post_install_message: 
@@ -92,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Color scheme converters for vim, textmate, kate/kwrite, jedit