coloration 0.2.5 → 0.3.0

data/lib/coloration/version.rb

@@ -1,3 +1,3 @@
 module Coloration
-  VERSION = "0.2.5".freeze
+  VERSION = "0.3.0".freeze
 end

data/lib/coloration/writers/vim_theme_writer.rb

@@ -1,6 +1,11 @@
 module Coloration
   module Writers
     module VimThemeWriter
+      XTERM_COLORS = [ 0x00, 0x5F, 0x87, 0xAF, 0xD7, 0xFF ]
+      XTERM_GREYS  = [ 0x08, 0x12, 0x1C, 0x26, 0x30, 0x3A,
+                       0x44, 0x4E, 0x58, 0x62, 0x6C, 0x76,
+                       0x80, 0x8A, 0x94, 0x9E, 0xA8, 0xB2,
+                       0xBC, 0xC6, 0xD0, 0xDA, 0xE4, 0xEE ]
 
       def build_result
         add_line "\" Vim color file"
@@ -26,7 +31,8 @@ module Coloration
           "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"]),
+          "ColorColumn" => Style.new(:bg => @ui["lineHighlight"]),
+          "LineNr" => Style.new(:fg => @ui["foreground"].mix_with(@ui["background"], 50), :bg => @ui["lineHighlight"]),
           "VertSplit" => Style.new(:fg => border_color, :bg => border_color),
           "MatchParen" => @items["keyword"],
           "StatusLine" => Style.new(:fg => @ui["foreground"], :bg => border_color, :bold => true),
@@ -179,14 +185,81 @@ module Coloration
 
       def format_style(style)
         style ||= Style.new
-        s = ""
-        s << " guifg=" << (style.foreground.try(:html) || "NONE")
-        s << " guibg=" << (style.background.try(:html) || "NONE")
-        gui = [style.inverse && "inverse", style.bold && "bold", style.underline && "underline", style.italic && "italic"].compact
-        s << " gui=" << (gui.empty? ? "NONE" : gui.join(","))
-        s
+
+        if fg = style.foreground
+          ctermfg = rgb_to_xterm256(fg)
+          guifg = fg.html
+        else
+          ctermfg = 'none'
+          guifg = 'none'
+        end
+
+        if bg = style.background
+          ctermbg = rgb_to_xterm256(bg)
+          guibg = bg.html
+        else
+          ctermbg = 'none'
+          guibg = 'none'
+        end
+
+        gui_attrs = [
+          style.inverse && 'inverse',
+          style.bold && 'bold',
+          style.underline && 'underline',
+          style.italic && 'italic'
+        ].compact
+
+        cterm_attrs = gui_attrs.reject { |a| a == 'italic' }
+
+        gui = gui_attrs.empty? ? 'none' : gui_attrs.join(',')
+        cterm = cterm_attrs.empty? ? 'none' : cterm_attrs.join(',')
+
+        "ctermfg=#{ctermfg} ctermbg=#{ctermbg} cterm=#{cterm} " +
+          "guifg=#{guifg} guibg=#{guibg} gui=#{gui}"
+      end
+
+      def rgb_to_xterm256(c)
+        a_r = (c.r * 255.0).to_i
+        a_g = (c.g * 255.0).to_i
+        a_b = (c.b * 255.0).to_i
+
+        if a_r == 0 && a_g == 0 && a_b == 0
+          return 0
+        end
+
+        if a_r == 255 && a_g == 255 && a_b == 255
+          return 15
+        end
+
+        greys_colors = XTERM_GREYS + XTERM_COLORS
+        len = XTERM_COLORS.size
+
+        r = get_nearest_xterm_color(a_r, greys_colors)
+        g = get_nearest_xterm_color(a_g, greys_colors)
+        b = get_nearest_xterm_color(a_b, greys_colors)
+
+        if r == g && g == b && (i = XTERM_GREYS.index(r))
+          n = len * len * len + i
+        else
+          r = get_nearest_xterm_color(a_r, XTERM_COLORS)
+          g = get_nearest_xterm_color(a_g, XTERM_COLORS)
+          b = get_nearest_xterm_color(a_b, XTERM_COLORS)
+
+          n = XTERM_COLORS.index(r) * len * len +
+              XTERM_COLORS.index(g) * len +
+              XTERM_COLORS.index(b)
+        end
+
+        16 + n
       end
 
+      def get_nearest_xterm_color(v, colors)
+        0.upto(colors.size - 2) do |i|
+          return colors[i] if v <= (colors[i] + colors[i+1]) / 2
+        end
+
+        colors.last
+      end
     end
   end
 end

metadata

@@ -1,126 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: coloration
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Marcin Kulik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-17 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: textpow19
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &69495040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 11
-        version: "0.11"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: color-tools
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *69495040
+- !ruby/object:Gem::Dependency
+  name: color-tools
+  requirement: &69546540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: plist
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *69546540
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: &69709450 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *69709450
 description: Color scheme converters for vim, textmate, kate/kwrite, jedit
 email: marcin.kulik@gmail.com
-executables: 
-- tm2jedit
-- tm2katepart
+executables:
 - tm2vim
+- tm2katepart
+- tm2jedit
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- bin/tm2jedit
-- bin/tm2katepart
+files:
 - bin/tm2vim
-- lib/coloration/color_rgba.rb
-- lib/coloration/style.rb
-- lib/coloration/version.rb
+- bin/tm2katepart
+- bin/tm2jedit
 - lib/coloration/extensions.rb
-- lib/coloration/abstract_converter.rb
+- lib/coloration/readers/textmate_theme_reader.rb
+- lib/coloration/converters/textmate2katepart.rb
 - lib/coloration/converters/textmate2vim.rb
 - lib/coloration/converters/textmate2jedit.rb
-- lib/coloration/converters/textmate2katepart.rb
 - lib/coloration/writers/katepart_theme_writer.rb
 - lib/coloration/writers/vim_theme_writer.rb
 - lib/coloration/writers/jedit_theme_writer.rb
-- lib/coloration/readers/textmate_theme_reader.rb
+- lib/coloration/abstract_converter.rb
+- lib/coloration/version.rb
+- lib/coloration/color_rgba.rb
+- lib/coloration/style.rb
 - lib/coloration.rb
 - README.md
-has_rdoc: true
 homepage: http://github.com/sickill/coloration
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
+  requirements:
   - - ~>
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      version: "1.9"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+    - !ruby/object:Gem::Version
+      version: '1.9'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Color scheme converters for vim, textmate, kate/kwrite, jedit
 test_files: []
-