coloration 0.2 → 0.2.1

data/lib/coloration/readers/textmate_theme_reader.rb

@@ -51,16 +51,21 @@ module Coloration
         @score_manager = Textpow::ScoreManager.new
       end
 
-      def [](key)
-        best_selector = nil
-        best_score = 0
-        @items.keys.each do |selector|
-          score = @score_manager.score(selector, key)
-          if score > best_score
-            best_score, best_selector = score, selector
+      def [](keys)
+        keys.split(",").each do |key|
+          best_selector = nil
+          best_score = 0
+          @items.keys.each do |selector|
+            score = @score_manager.score(selector, key)
+            if score > best_score
+              best_score, best_selector = score, selector
+            end
+          end
+          if best_selector
+            return @items[best_selector]
           end
         end
-        best_selector && @items[best_selector]
+        nil
       end
     end
   end

data/lib/coloration/version.rb

@@ -1,3 +1,3 @@
 module Coloration
-  VERSION = "0.2".freeze
+  VERSION = "0.2.1".freeze
 end

data/lib/coloration/writers/jedit_theme_writer.rb

@@ -22,7 +22,7 @@ module Coloration
 
         items_mapping = {
           "view.style.comment1"     => @items["comment"], # #foo
-          "view.style.literal1"     => @items["string"], # "foo"
+          "view.style.literal1"     => @items["string,string.quoted"], # "foo"
           "view.style.label"        => @items["constant.other.symbol"], # :foo
           "view.style.digit"        => @items["constant.numeric"], # 123
           "view.style.keyword1"     => @items["keyword.control"], # class, def, if, end

data/lib/coloration/writers/katepart_theme_writer.rb

@@ -26,7 +26,7 @@ module Coloration
           "Normal"         => nil,
           "Others"         => nil,
           "Region Marker"  => nil,
-          "String"         => @items["string"]
+          "String"         => @items["string,string.quoted"]
         }
 
         items_mapping.keys.each do |key|
@@ -68,7 +68,7 @@ module Coloration
         add_line "Ruby/Rails/RHTML:Message=0," + format_style(@default_style)
         add_line "Ruby/Rails/RHTML:Raw String=0," + format_style(@items["string.quoted.single"])
         add_line "Ruby/Rails/RHTML:Symbol=0," + format_style(@items["constant.other.symbol.ruby"])
-        add_line "Ruby/Rails/RHTML:Value=0," + format_style(@items["string"])
+        add_line "Ruby/Rails/RHTML:Value=0," + format_style(@items["string,string.quoted"])
         add_line "Ruby/Rails/RHTML:Element=0," + format_style(@items["meta.tag"] || @items["entity.name.tag"])
         add_line "Ruby/Rails/RHTML:Kernel methods=0," + format_style(@items["support.function"])
         add_line "Ruby/Rails/RHTML:Attribute=0," + format_style(@items["entity.other.attribute-name"])
@@ -76,7 +76,7 @@ module Coloration
         add_line
 
         add_line "[Highlighting XML - Schema #{name}]"
-        add_line "XML:Value=0," + format_style(@items["string"])
+        add_line "XML:Value=0," + format_style(@items["string,string.quoted"])
         add_line "XML:Element=0," + format_style(@items["meta.tag"] || @items["entity.name.tag"])
         add_line "XML:Attribute=0," + format_style(@items["entity.other.attribute-name"])
 

data/lib/coloration/writers/vim_theme_writer.rb

@@ -17,17 +17,20 @@ module Coloration
         add_line "let g:colors_name = \"#{@name}\""
         add_line
 
-        search_style = @items["variable"] || @items["entity"] || @items["keyword"]
+        default_style = Style.new(:fg => @ui["foreground"])
+        search_style = @items["variable"] || @items["entity"] || @items["keyword"] || default_style
+        border_color = @ui["background"].lighten_by(81)
+
         ui_mapping = {
           "Cursor" => Style.new(:bg => @ui["caret"]),
           "Visual" => Style.new(:bg => @ui["selection"]),
           "CursorLine" => Style.new(:bg => @ui["lineHighlight"]),
           "CursorColumn" => Style.new(:bg => @ui["lineHighlight"]),
           "LineNr" => Style.new(:fg => @ui["foreground"].mix_with(@ui["background"], 50), :bg => @ui["background"]),
-          "VertSplit" => Style.new(:fg => @ui["selection"], :bg => @ui["selection"]),
+          "VertSplit" => Style.new(:fg => border_color, :bg => border_color),
           "MatchParen" => @items["keyword"],
-          "StatusLine" => Style.new(:fg => @ui["foreground"], :bg => @ui["selection"], :bold => true),
-          "StatusLineNC" => Style.new(:fg => @ui["foreground"], :bg => @ui["selection"]),
+          "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)),
@@ -37,7 +40,7 @@ module Coloration
         }
 
         ui_mapping.keys.each do |key|
-          add_line(format_item(key, ui_mapping[key]))
+          add_line(format_item(key, ui_mapping[key] || default_style))
         end
 
         add_line
@@ -75,7 +78,7 @@ module Coloration
           "SpecialKey" => Style.new(:fg => @ui["invisibles"], :bg => @ui["lineHighlight"]),
           "Statement" => "keyword.control",
           "StorageClass" => "storage.type",
-          "String" => "string",
+          "String" => "string,string.quoted",
           #"Structure" => [],
           "Tag" => "entity.name.tag",
           "Title" => Style.new(:fg => @ui["foreground"], :bold => true),
@@ -89,8 +92,8 @@ module Coloration
           "rubyFunction" => "entity.name.function.ruby",
           "rubyInterpolationDelimiter" => "",
           "rubySymbol" => "constant.other.symbol.ruby",
-          "rubyConstant" => "support",
-          "rubyStringDelimiter" => "string",
+          "rubyConstant" => "support.class",
+          "rubyStringDelimiter" => "string,string.quoted",
           "rubyBlockParameter" => "variable.parameter",
           "rubyInstanceVariable" => "variable.language",
           "rubyInclude" => "keyword.other.special-method.ruby",
@@ -147,8 +150,6 @@ module Coloration
           "cssBraces" => "punctuation.section.property-list.css",
         }
 
-        default_style = Style.new
-        default_style.foreground = @ui["foreground"]
         items_mapping.keys.each do |key|
           add_line(format_item(key, items_mapping[key] || default_style))
         end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Marcin Kulik