Merge pull request #38 from sunaku/master

iterm2xrdb script update to fix issue #37

tools/iterm2xrdb

@@ -1,17 +1,16 @@
 #!/usr/bin/env ruby
 #
-# Converts iTerm2 color schemes into xrdb(1) format, as a set of `#define`s,
-# and prints the result to STDOUT.  Reads STDIN if no input files are given.
-#
 # Usage: iterm2xrdb FILE...
 # Usage: cat FILE... | iterm2xrdb
 # Usage: iterm2xrdb < INPUT
 #
-#--
+# Converts iTerm2 color schemes into xrdb(1) format, as a set of `#define`s,
+# and prints the result to STDOUT.  Reads STDIN if no input files are given.
+#
 # Written in 2013 by Suraj N. Kurapati <https://github.com/sunaku>
 
-ARGF.read.scan(%r{>(.+?)</}).flatten(1).each_slice(7) do |color, *components|
-  puts "#define #{ color.gsub(/\W/, ?_) } #" + Hash[*components].
-        values_at('Red Component', 'Green Component', 'Blue Component').
-        map {|intensity| sprintf '%02x', (intensity.to_f * 255).round }.join
-end
+puts ARGF.read.scan(%r{>(.+?)</}).flatten(1).slice_before(/\bColor$/).map {
+  |color, *pairs| "#define #{ color.gsub(/\W/, ?_) } #" + Hash[*pairs].
+  values_at('Red Component', 'Green Component', 'Blue Component').
+  map { |intensity| sprintf '%02x', (intensity.to_f * 255).round }.join
+}.to_a

xrdb/Afterglow.xrdb

@@ -1,20 +1,20 @@
 #define Ansi_0_Color #151515
-#define Ansi_1_Color #a53c23
-#define Ansi_10_Color #7b9246
-#define Ansi_11_Color #d3a04d
-#define Ansi_12_Color #547c99
+#define Ansi_1_Color #ac4142
+#define Ansi_10_Color #7e8e50
+#define Ansi_11_Color #e5b567
+#define Ansi_12_Color #6c99bb
 #define Ansi_13_Color #9f4e85
 #define Ansi_14_Color #7dd6cf
 #define Ansi_15_Color #f5f5f5
-#define Ansi_2_Color #7b9246
-#define Ansi_3_Color #d3a04d
+#define Ansi_2_Color #7e8e50
+#define Ansi_3_Color #e5b567
 #define Ansi_4_Color #6c99bb
 #define Ansi_5_Color #9f4e85
 #define Ansi_6_Color #7dd6cf
 #define Ansi_7_Color #d0d0d0
 #define Ansi_8_Color #505050
-#define Ansi_9_Color #a53c23
-#define Background_Color #222222
+#define Ansi_9_Color #ac4142
+#define Background_Color #212121
 #define Bold_Color #d0d0d0
 #define Cursor_Color #d0d0d0
 #define Cursor_Text_Color #151515

xrdb/AtelierSulphurpool.xrdb

@@ -0,0 +1,23 @@
+#define Ansi_0_Color #202746
+#define Ansi_1_Color #c94922
+#define Ansi_10_Color #293256
+#define Ansi_11_Color #5e6687
+#define Ansi_12_Color #898ea4
+#define Ansi_13_Color #dfe2f1
+#define Ansi_14_Color #9c637a
+#define Ansi_15_Color #f5f7ff
+#define Ansi_2_Color #ac9739
+#define Ansi_3_Color #c08b30
+#define Ansi_4_Color #3d8fd1
+#define Ansi_5_Color #6679cc
+#define Ansi_6_Color #22a2c9
+#define Ansi_7_Color #979db4
+#define Ansi_8_Color #6b7394
+#define Ansi_9_Color #c76b29
+#define Background_Color #202746
+#define Bold_Color #979db4
+#define Cursor_Color #979db4
+#define Cursor_Text_Color #202746
+#define Foreground_Color #979db4
+#define Selected_Text_Color #979db4
+#define Selection_Color #5e6687

xrdb/Batman.xrdb

@@ -1,43 +1,27 @@
-#define Ansi_0_Color #00001e
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_9033104482323232 #000000
-#define Calibrated #fff200
-#define 1 #00ed6c
-#define Red_Component #000095
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_60372972901580058 #9a0000
-#define 0_65043008207070707 #a3a300
-#define Ansi_15_Color #0000d6
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_78594539141414144 #000000
-#define Calibrated #f4fd00
-#define 1 #007174
-#define Red_Component #000071
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_37527690995282659 #620000
-#define 0_74857144791527919 #c6c500
-#define Ansi_8_Color #000054
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 1 #000000
-#define Calibrated #1b1d00
-#define 0_5 #00f789
-#define Red_Component #0000ff
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_93713031081371878 #fc0000
-#define 0_39226572377535729 #fcff00
+#define Ansi_0_Color #1b1d1e
+#define Ansi_1_Color #e6dc44
+#define Ansi_10_Color #fff27d
+#define Ansi_11_Color #feed6c
+#define Ansi_12_Color #919495
+#define Ansi_13_Color #9a9a9d
+#define Ansi_14_Color #a3a3a6
+#define Ansi_15_Color #dadbd6
+#define Ansi_2_Color #c8be46
+#define Ansi_3_Color #f4fd22
+#define Ansi_4_Color #737174
+#define Ansi_5_Color #747271
+#define Ansi_6_Color #62605f
+#define Ansi_7_Color #c6c5bf
+#define Ansi_8_Color #505354
+#define Ansi_9_Color #fff78e
+#define Background_Color #1b1d1e
+#define Badge_Color #fff789
+#define Bold_Color #ffffff
+#define Cursor_Color #fcef0c
+#define Cursor_Guide_Color #fcff64
 #define Cursor_Text_Color #000000
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_43487813075383508 #000000
-#define Calibrated #ad9f00
-#define 1 #00e04a
-#define Red_Component #00004c
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_0 #000000
+#define Foreground_Color #6f6f6f
+#define Link_Color #ad9f07
+#define Selected_Text_Color #f0e04a
+#define Selection_Color #4d504c
+#define Tab_Color #000000

xrdb/Brogrammer.xrdb

@@ -15,9 +15,13 @@
 #define Ansi_8_Color #d6dbe5
 #define Ansi_9_Color #de352e
 #define Background_Color #131313
+#define Badge_Color #ff0000
 #define Bold_Color #d6dbe5
 #define Cursor_Color #b9b9b9
+#define Cursor_Guide_Color #a6e8ff
 #define Cursor_Text_Color #101010
 #define Foreground_Color #d6dbe5
+#define Link_Color #0645ad
 #define Selected_Text_Color #d6dbe5
-#define Selection_Color #1f1f1f
+#define Selection_Color #3a3a3a
+#define Tab_Color #000000

xrdb/Fideloper.xrdb

@@ -0,0 +1,27 @@
+#define Ansi_0_Color #292f33
+#define Ansi_1_Color #cb1e2d
+#define Ansi_10_Color #d4605a
+#define Ansi_11_Color #a86671
+#define Ansi_12_Color #7c85c4
+#define Ansi_13_Color #5c5db2
+#define Ansi_14_Color #819090
+#define Ansi_15_Color #fcf4df
+#define Ansi_2_Color #edb8ac
+#define Ansi_3_Color #b7ab9b
+#define Ansi_4_Color #2e78c2
+#define Ansi_5_Color #c0236f
+#define Ansi_6_Color #309186
+#define Ansi_7_Color #eae3ce
+#define Ansi_8_Color #092028
+#define Ansi_9_Color #d4605a
+#define Background_Color #292f33
+#define Badge_Color #ff0000
+#define Bold_Color #6b7c7c
+#define Cursor_Color #d4605a
+#define Cursor_Guide_Color #a6e8ff
+#define Cursor_Text_Color #fefff2
+#define Foreground_Color #dbdae0
+#define Link_Color #0645ad
+#define Selected_Text_Color #ffffff
+#define Selection_Color #efb8ac
+#define Tab_Color #000000

xrdb/Hipster Green.xrdb

@@ -20,4 +20,4 @@
 #define Cursor_Text_Color #ff0018
 #define Foreground_Color #84c138
 #define Selected_Text_Color #ffffff
-#define Selection_Color #083905
+#define Selection_Color #083905

xrdb/Jackie Brown.xrdb

@@ -20,4 +20,4 @@
 #define Cursor_Text_Color #ff0018
 #define Foreground_Color #ffcc2f
 #define Selected_Text_Color #ffffff
-#define Selection_Color #af8d21
+#define Selection_Color #af8d21

xrdb/Molokai.xrdb

@@ -1,23 +1,23 @@
 #define Ansi_0_Color #121212
-#define Ansi_1_Color #7325FA
-#define Ansi_10_Color #5FE0B1
-#define Ansi_11_Color #6DF2FF
-#define Ansi_12_Color #FFAF00
-#define Ansi_13_Color #FF87AF
-#define Ansi_14_Color #FFCE51
-#define Ansi_15_Color #FFFFFF
-#define Ansi_2_Color #23E298
-#define Ansi_3_Color #60D4DF
-#define Ansi_4_Color #D08010
-#define Ansi_5_Color #FF0087
-#define Ansi_6_Color #D0A843
-#define Ansi_7_Color #BBBBBB
+#define Ansi_1_Color #fa2573
+#define Ansi_10_Color #b1e05f
+#define Ansi_11_Color #fff26d
+#define Ansi_12_Color #00afff
+#define Ansi_13_Color #af87ff
+#define Ansi_14_Color #51ceff
+#define Ansi_15_Color #ffffff
+#define Ansi_2_Color #98e123
+#define Ansi_3_Color #dfd460
+#define Ansi_4_Color #1080d0
+#define Ansi_5_Color #8700ff
+#define Ansi_6_Color #43a8d0
+#define Ansi_7_Color #bbbbbb
 #define Ansi_8_Color #555555
-#define Ansi_9_Color #9D66F6
+#define Ansi_9_Color #f6669d
 #define Background_Color #121212
-#define Bold_Color #FFFFFF
-#define Cursor_Color #BBBBBB
-#define Cursor_Text_Color #FFFFFF
-#define Foreground_Color #BBBBBB
+#define Bold_Color #ffffff
+#define Cursor_Color #bbbbbb
+#define Cursor_Text_Color #ffffff
+#define Foreground_Color #bbbbbb
 #define Selected_Text_Color #000000
-#define Selection_Color #FFD5B5
+#define Selection_Color #b5d5ff

xrdb/Parasio Dark.xrdb

@@ -0,0 +1,23 @@
+#define Ansi_0_Color #2f1e2e
+#define Ansi_1_Color #ef6155
+#define Ansi_10_Color #48b685
+#define Ansi_11_Color #fec418
+#define Ansi_12_Color #06b6ef
+#define Ansi_13_Color #815ba4
+#define Ansi_14_Color #5bc4bf
+#define Ansi_15_Color #e7e9db
+#define Ansi_2_Color #48b685
+#define Ansi_3_Color #fec418
+#define Ansi_4_Color #06b6ef
+#define Ansi_5_Color #815ba4
+#define Ansi_6_Color #5bc4bf
+#define Ansi_7_Color #a39e9b
+#define Ansi_8_Color #776e71
+#define Ansi_9_Color #ef6155
+#define Background_Color #2f1e2e
+#define Bold_Color #a39e9b
+#define Cursor_Color #a39e9b
+#define Cursor_Text_Color #2f1e2e
+#define Foreground_Color #a39e9b
+#define Selected_Text_Color #a39e9b
+#define Selection_Color #4f424c

xrdb/PaulMillr.xrdb

@@ -7,7 +7,7 @@
 #define Ansi_14_Color #7adff2
 #define Ansi_15_Color #ffffff
 #define Ansi_2_Color #79ff0f
-#define Ansi_3_Color #d3bf00
+#define Ansi_3_Color #e7bf00
 #define Ansi_4_Color #396bd7
 #define Ansi_5_Color #b449be
 #define Ansi_6_Color #66ccff

xrdb/Spiderman.xrdb

@@ -1,43 +1,27 @@
-#define Ansi_0_Color #00001e
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_9033104482323232 #000000
-#define Calibrated #ff3300
-#define 1 #003a35
-#define Red_Component #0000ff
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_48453312512483204 #740000
-#define 1 #618400
-#define Ansi_15_Color #0000f9
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_88796164769999997 #000000
-#define Calibrated #e24700
-#define 1 #003fff
-#define Red_Component #0000db
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_33661209508801904 #320000
-#define 0_96499464781102917 #fffe00
-#define Ansi_8_Color #000054
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 1 #000000
-#define Calibrated #1b1d00
-#define 0_5 #0090ff
-#define Red_Component #0000ff
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_24861840769999999 #2c0000
-#define 0_29956932379522949 #ff5800
+#define Ansi_0_Color #1b1d1e
+#define Ansi_1_Color #e60813
+#define Ansi_10_Color #ff3338
+#define Ansi_11_Color #fe3a35
+#define Ansi_12_Color #1d50ff
+#define Ansi_13_Color #747cff
+#define Ansi_14_Color #6184ff
+#define Ansi_15_Color #fffff9
+#define Ansi_2_Color #e22928
+#define Ansi_3_Color #e24756
+#define Ansi_4_Color #2c3fff
+#define Ansi_5_Color #2435db
+#define Ansi_6_Color #3256ff
+#define Ansi_7_Color #fffef6
+#define Ansi_8_Color #505354
+#define Ansi_9_Color #ff0325
+#define Background_Color #1b1d1e
+#define Badge_Color #8890ff
+#define Bold_Color #ffffff
+#define Cursor_Color #2c3fff
+#define Cursor_Guide_Color #ff584c
 #define Cursor_Text_Color #000000
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_88971748737373735 #000000
-#define Calibrated #ad2000
-#define 1 #00272d
-#define Red_Component #000050
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_0 #000000
+#define Foreground_Color #e3e3e3
+#define Link_Color #ad201e
+#define Selected_Text_Color #f0272d
+#define Selection_Color #070e50
+#define Tab_Color #000000

xrdb/The Hulk.xrdb

@@ -1,43 +1,27 @@
-#define Ansi_0_Color #00001e
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_14859966266501204 #000000
-#define Calibrated #48ff00
-#define 1 #00fe16
-#define Red_Component #000095
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_3435349775055469 #720000
-#define 0_65043008327484131 #408500
-#define Ansi_15_Color #0000e1
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_076066421435449241 #000000
-#define Calibrated #63e400
-#define 1 #0025f5
-#define Red_Component #000074
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_54991022034746728 #370000
-#define 0_81944967499937305 #d9d800
-#define Ansi_8_Color #000054
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_55439623311334207 #000000
-#define Calibrated #1b1d00
-#define 0_5 #00ff86
-#define Red_Component #0000ff
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_71403488005050497 #160000
-#define 1 #595900
+#define Ansi_0_Color #1b1d1e
+#define Ansi_1_Color #269d1b
+#define Ansi_10_Color #48ff77
+#define Ansi_11_Color #3afe16
+#define Ansi_12_Color #506b95
+#define Ansi_13_Color #72589d
+#define Ansi_14_Color #4085a6
+#define Ansi_15_Color #e5e6e1
+#define Ansi_2_Color #13ce30
+#define Ansi_3_Color #63e457
+#define Ansi_4_Color #2525f5
+#define Ansi_5_Color #641f74
+#define Ansi_6_Color #378ca9
+#define Ansi_7_Color #d9d8d1
+#define Ansi_8_Color #505354
+#define Ansi_9_Color #8dff2a
+#define Background_Color #1b1d1e
+#define Badge_Color #87ff86
+#define Bold_Color #ffffff
+#define Cursor_Color #16b61b
+#define Cursor_Guide_Color #5959ff
 #define Cursor_Text_Color #000000
-#define Green_Component #000000
-#define Blue_Component #000000
-#define 0_70869048285965963 #000000
-#define Calibrated #09ad00
-#define 1 #006309
-#define Red_Component #00004c
-#define Color_Space #000000
-#define Alpha_Component #000000
-#define 0_0 #000000
+#define Foreground_Color #b5b5b5
+#define Link_Color #09ad4d
+#define Selected_Text_Color #0b6309
+#define Selection_Color #4d504c
+#define Tab_Color #000000