textbringer 25 → 26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32054ff4c06164a8e49a6d82bde0d32fb2aed2e7fa1c842fa908fbb57abd5a6f
-  data.tar.gz: 7cebf42f75471bce99359f177344d0ce141cf617e9f350ac341a06253d48a4e8
+  metadata.gz: e2675c1e38b9c3e24666f87ebf58f4cede5bca7dfec811eec58cee700a500f33
+  data.tar.gz: b1835247ba5c703983dea5b80a84fb26b0f43954ee1cb9b737ac82e23a843278
 SHA512:
-  metadata.gz: a96f17982fa5b370357fc97bfd5e14617a0af7df230e5ad40071f0b751e82860ea0a01f025f8279aa6f38847d59484f159fa9244ed057f084d537c8f3c5741c7
-  data.tar.gz: 0fd05fb7d8aa16e51550e5276d549547b2023fad1b06aadc278fc41215da145a249fe868f632371811a10ab7680e4e9aa74e4db653665c733f2132a61e58456a
+  metadata.gz: 7bb45438e1cf3912540446ceeed8dcbbbfc1ac4c796242a7d63783e0741223051d4edd200aaa2aa5a1f0c8d01c0b7a8c94f3a9f576b303e29f6303357ae3f2b8
+  data.tar.gz: 30ed7d5c79192c5bfdf81122d018ae9269e30087b24be951a7d795c5a0e92aaf84aa7a9f2d58d476ed241e57b44d39ff15284549249127ac3ab811e79ce096ac

data/README.ja.md

@@ -58,6 +58,14 @@ Textbringerが依存するcurses.gemをインストールする前に、ncursesw
     mod_meta_key = alt
     mod_meta_mode = esc
 
+### True color (24ビットカラー)
+
+端末エミュレータがtrue colorに対応している場合、`TERM`に`xterm-direct`を設定すると24ビットカラーが有効になります。
+
+    $ TERM=xterm-direct txtb
+
+テーマで指定されたhex色が256色パレットに近似されず、そのまま表示されるようになります。
+
 ### 東アジアの曖昧な文字幅
 
 [曖昧な文字](http://unicode.org/reports/tr11/#Ambiguous)を全角扱いするには、以下の設定を~/.textbringer.rbに記述してください。
@@ -91,6 +99,22 @@ xterm、 mlterm、screenにはそれぞれ独自の設定項目があります
 
     cjkwidth on
 
+## テーマ
+
+`Alt+x load_theme RET` で[textbringer/themes](lib/textbringer/themes)または~/.textbringer/themes内のテーマを読み込むことができます。
+
+~/.textbringer.rbでテーマを設定することもできます。
+
+```ruby
+load_theme "catppuccin"
+```
+
+テーマが独自の背景色を設定している場合に、端末のデフォルト背景色を使いたいときは`load_theme`の後に以下を追加してください。
+
+```ruby
+set_background_color "default"
+```
+
 ## プラグイン
 
 * [Mournmail](https://github.com/shugo/mournmail): 電子メールクライアント

data/README.md

@@ -60,6 +60,14 @@ Add the following lines to ~/.mlterm/main.
     mod_meta_key = alt
     mod_meta_mode = esc
 
+### True color (24-bit color)
+
+If your terminal emulator supports true color, set `TERM` to `xterm-direct` to enable 24-bit color.
+
+    $ TERM=xterm-direct txtb
+
+This allows themes to display their exact hex colors instead of approximating to the 256-color palette.
+
 ### East asian ambiguous width
 
 Add the following line to ~/.textbringer.rb to treat
@@ -103,6 +111,22 @@ Add the following line to ~/.screenrc.
 * [textbringer-presentation](https://github.com/shugo/textbringer-presentation): a presentation tool
 * [textbringer-ghost_text](https://github.com/shugo/textbringer-ghost_text): a [GhostText](https://github.com/fregante/GhostText) plugin
 
+## Themes
+
+Type `Alt+x load_theme RET` to load a theme from [textbringer/themes](lib/textbringer/themes) or ~/.textbringer/themes.
+
+Themes can also be loaded in ~/.textbringer.rb.
+
+```ruby
+load_theme "catppuccin"
+```
+
+If a theme sets its own background color but you prefer to use the terminal's default background, add the following after `load_theme`:
+
+```ruby
+set_background_color "default"
+```
+
 ## Development
 
 After checking out the repo, run `bundle install` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/textbringer/color.rb

@@ -22,6 +22,30 @@ module Textbringer
       "brightwhite" => 15
     }
 
+    DIRECT_COLOR_THRESHOLD = 256 * 256 * 256
+
+    # Canonical RGB values for basic ANSI colors (xterm defaults),
+    # packed as 0xRRGGBB for use in direct color mode.
+    BASIC_COLORS_RGB = {
+      "default"       => -1,
+      "black"         => 0x000000,
+      "red"           => 0xCD0000,
+      "green"         => 0x00CD00,
+      "yellow"        => 0xCDCD00,
+      "blue"          => 0x0000EE,
+      "magenta"       => 0xCD00CD,
+      "cyan"          => 0x00CDCD,
+      "white"         => 0xE5E5E5,
+      "brightblack"   => 0x7F7F7F,
+      "brightred"     => 0xFF0000,
+      "brightgreen"   => 0x00FF00,
+      "brightyellow"  => 0xFFFF00,
+      "brightblue"    => 0x5C5CFF,
+      "brightmagenta" => 0xFF00FF,
+      "brightcyan"    => 0x00FFFF,
+      "brightwhite"   => 0xFFFFFF
+    }
+
     RGBColor = Struct.new(:r, :g, :b, :number)
 
     ADDITIONAL_COLORS = []
@@ -46,10 +70,17 @@ module Textbringer
       end
     end
 
+    def self.direct_color?
+      Window.colors >= DIRECT_COLOR_THRESHOLD
+    end
+
     def self.find_color_number(name)
       if name.is_a?(Integer)
         return name
       end
+      if direct_color?
+        return find_direct_color(name)
+      end
       case name
       when /\A\#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})\z/
         r = $1.to_i(16)
@@ -65,5 +96,20 @@ module Textbringer
         BASIC_COLORS[name]
       end
     end
+
+    def self.find_direct_color(name)
+      case name
+      when /\A\#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})\z/
+        r = $1.to_i(16)
+        g = $2.to_i(16)
+        b = $3.to_i(16)
+        (r << 16) | (g << 8) | b
+      else
+        unless BASIC_COLORS_RGB.key?(name)
+          raise EditorError, "No such color: #{name}"
+        end
+        BASIC_COLORS_RGB[name]
+      end
+    end
   end
 end

data/lib/textbringer/commands/misc.rb

@@ -291,46 +291,48 @@ module Textbringer
         if CONFIG[:shell_file_name]
           cmd = [CONFIG[:shell_file_name], CONFIG[:shell_command_switch], cmd]
         end
-        Open3.popen3(*cmd, opts) do |input, output, error, wait_thread|
-          input.close
-          catch(:finish) do
-            loop do
-              rs, = IO.select([output, error], nil, nil, 0.5)
-              Window.redisplay
-              rs&.each do |r|
-                begin
-                  s = r.read_nonblock(1024).force_encoding("utf-8").
-                    scrub("\u{3013}").gsub(/\r\n/, "\n")
-                  buffer.insert(s)
-                  Window.redisplay
-                rescue EOFError
-                  throw(:finish) if output.eof? && error.eof?
-                rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-                  Window.redisplay
-                  next
+        with_clean_env do |env|
+          Open3.popen3(env, *cmd, opts) do |input, output, error, wait_thread|
+            input.close
+            catch(:finish) do
+              loop do
+                rs, = IO.select([output, error], nil, nil, 0.5)
+                Window.redisplay
+                rs&.each do |r|
+                  begin
+                    s = r.read_nonblock(1024).force_encoding("utf-8").
+                      scrub("\u{3013}").gsub(/\r\n/, "\n")
+                    buffer.insert(s)
+                    Window.redisplay
+                  rescue EOFError
+                    throw(:finish) if output.eof? && error.eof?
+                  rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+                    Window.redisplay
+                    next
+                  end
                 end
-              end
-              if received_keyboard_quit?
-                if signals.empty?
-                  keyboard_quit
-                else
-                  sig = signals.shift
-                  pid = wait_thread.pid
-                  pid = -pid if /mswin32|mingw32/ !~ RUBY_PLATFORM
-                  message("Send #{sig} to #{pid}")
-                  Process.kill(sig, pid)
+                if received_keyboard_quit?
+                  if signals.empty?
+                    keyboard_quit
+                  else
+                    sig = signals.shift
+                    pid = wait_thread.pid
+                    pid = -pid if /mswin32|mingw32/ !~ RUBY_PLATFORM
+                    message("Send #{sig} to #{pid}")
+                    Process.kill(sig, pid)
+                  end
                 end
               end
             end
-          end
-          status = wait_thread.value
-          pid = status.pid
-          if status.exited?
-            code = status.exitstatus
-            message("Process #{pid} exited with status code #{code}")
-          elsif status.signaled?
-            signame = Signal.signame(status.termsig)
-            message("Process #{pid} was killed by #{signame}")
+            status = wait_thread.value
+            pid = status.pid
+            if status.exited?
+              code = status.exitstatus
+              message("Process #{pid} exited with status code #{code}")
+            elsif status.signaled?
+              signame = Signal.signame(status.termsig)
+              message("Process #{pid} was killed by #{signame}")
+            end
           end
         end
       ensure

data/lib/textbringer/input_methods/skk_input_method.rb

@@ -307,7 +307,7 @@ module Textbringer
       when "x"
         prev_candidate
         nil
-      when "\C-m", "\r", "\n"
+      when "\r", "\n"
         confirm_selecting
         nil
       else

data/lib/textbringer/modes/dired_mode.rb

@@ -188,7 +188,6 @@ module Textbringer
                          doc: "Delete files flagged for deletion.") do
       files = collect_flagged_files
       return if files.empty?
-      list = files.map { |f| "  #{f}" }.join("\n")
       if yes_or_no?("Delete these files?")
         files.each do |name|
           next if name == "." || name == ".."

data/lib/textbringer/modes/ruby_mode.rb

@@ -22,18 +22,13 @@ module Textbringer
       @prism_version = nil
       @prism_tokens = nil
       @prism_ast = nil
-      @prism_method_call_locs = nil
+      @prism_method_name_locs = nil
       @literal_levels = nil
       @literal_levels_version = nil
     end
 
     def forward_definition(n = number_prefix_arg || 1)
-      ensure_prism_tokens
-      tokens = @prism_tokens.filter_map { |token, _state|
-        type = token.type
-        next if type == :EOF
-        [token.location.start_line, type]
-      }
+      tokens = filter_prism_tokens_line_and_type
       @buffer.forward_line
       n.times do |i|
         tokens = tokens.drop_while { |l, type|
@@ -54,12 +49,7 @@ module Textbringer
     end
 
     def backward_definition(n = number_prefix_arg || 1)
-      ensure_prism_tokens
-      tokens = @prism_tokens.filter_map { |token, _state|
-        type = token.type
-        next if type == :EOF
-        [token.location.start_line, type]
-      }.reverse
+      tokens = filter_prism_tokens_line_and_type.reverse
       @buffer.beginning_of_line
       n.times do |i|
         tokens = tokens.drop_while { |l, type|
@@ -120,12 +110,11 @@ module Textbringer
     def highlight(ctx)
       ensure_prism_tokens
       return unless @prism_tokens
-      ensure_method_call_locs
+      ensure_method_name_locs
       base_pos = ctx.buffer.point_min
       hl_start = ctx.highlight_start
       hl_end = ctx.highlight_end
       in_symbol = false
-      after_def = false
       after_class_or_module = false
       @prism_tokens.each do |token_info|
         token = token_info[0]
@@ -139,26 +128,18 @@ module Textbringer
           face_name = PRISM_TOKEN_FACES[type]
           if in_symbol
             face_name = :string if face_name.nil? || face_name == :constant ||
-              face_name == :operator
-          elsif after_def
-            face_name = :function_name if type == :IDENTIFIER ||
-              type == :CONSTANT || type == :METHOD_NAME ||
-              PRISM_TOKEN_FACES[type] == :operator
+              face_name == :keyword || face_name == :operator
+          elsif @prism_method_name_locs.key?(offset)
+            face_name = :function_name
           elsif face_name == :constant &&
               (after_class_or_module || token.location.slice.match?(/\p{Lower}/))
             face_name = :type
-          elsif @prism_method_call_locs.key?(offset)
-            face_name = :function_name
           end
           if face_name && (face = Face[face_name])
             ctx.highlight(pos, pos_end, face)
           end
         end
         in_symbol = type == :SYMBOL_BEGIN
-        after_def = type == :KEYWORD_DEF ||
-          (after_def && (type == :KEYWORD_SELF || type == :DOT ||
-                         type == :NEWLINE || type == :IGNORED_NEWLINE ||
-                         type == :COMMENT))
         after_class_or_module = (type == :KEYWORD_CLASS || type == :KEYWORD_MODULE) ||
           (after_class_or_module && !(type == :NEWLINE || type == :SEMICOLON))
       end
@@ -199,6 +180,9 @@ module Textbringer
       # Strings and string-like
       STRING_BEGIN: :string, STRING_CONTENT: :string, STRING_END: :string,
       SYMBOL_BEGIN: :string, REGEXP_BEGIN: :string, REGEXP_END: :string,
+      PERCENT_LOWER_I: :string, PERCENT_UPPER_I: :string,
+      PERCENT_LOWER_W: :string, PERCENT_UPPER_W: :string,
+      PERCENT_LOWER_X: :string,
       HEREDOC_START: :string, HEREDOC_END: :string,
       LABEL: :property,
 
@@ -273,6 +257,8 @@ module Textbringer
       EQUAL_GREATER
     ].to_set
 
+    OPERATORS = %i(!= !~ =~ == === <=> > >= < <= & | ^ >> << - + % / * ** -@ +@ ~ ! [] []=)
+
     BLOCK_END = {
       EMBEXPR_BEGIN: :EMBEXPR_END,
       BRACE_LEFT: :BRACE_RIGHT,
@@ -489,6 +475,15 @@ module Textbringer
       @literal_levels[i][1] > 0
     end
 
+    def filter_prism_tokens_line_and_type
+      ensure_prism_tokens
+      @prism_tokens.filter_map { |token, _state|
+        type = token.type
+        next if type == :EOF
+        [token.location.start_line, type]
+      }
+    end
+
     def ensure_prism_tokens
       return if @prism_version == @buffer.version
       source = @buffer.to_s
@@ -499,27 +494,40 @@ module Textbringer
         @prism_ast = nil
         @prism_tokens = []
       end
-      @prism_method_call_locs = nil
+      @prism_method_name_locs = nil
       @prism_version = @buffer.version
       @literal_levels_version = nil
     end
 
-    def ensure_method_call_locs
-      return if @prism_method_call_locs
-      @prism_method_call_locs = {}
+    def ensure_method_name_locs
+      return if @prism_method_name_locs
+      @prism_method_name_locs = {}
       return unless @prism_ast
-      collect_method_call_locs(@prism_ast)
+      collect_method_name_locs(@prism_ast)
     end
 
-    def collect_method_call_locs(node)
-      if node.is_a?(Prism::CallNode) && node.message_loc
-        name_str = node.name.to_s
-        unless name_str.match?(/\A[^a-zA-Z_]/) || name_str.end_with?("@")
-          loc = node.message_loc
-          @prism_method_call_locs[loc.start_offset] = true
-        end
+    def collect_method_name_locs(node)
+      if node.type == :def_node
+        @prism_method_name_locs[node.name_loc.start_offset] = true
+      elsif node.type == :alias_method_node
+        add_alias_method_name_locs(node.new_name)
+        add_alias_method_name_locs(node.old_name)
+      elsif (node.type == :call_node &&
+             !(node.call_operator_loc.nil? && OPERATORS.include?(node.name)) &&          # exclude operators
+             !((node.call_operator_loc.nil? || node.call_operator_loc.slice == "::") &&  # exclude constants
+               /\A\p{Upper}/.match?(node.name))) ||
+          node.type == :call_operator_write_node ||
+          node.type == :call_and_write_node ||
+          node.type == :call_or_write_node
+        @prism_method_name_locs[node.message_loc.start_offset] = true
+      end
+      node.compact_child_nodes.each { |child| collect_method_name_locs(child) }
+    end
+
+    def add_alias_method_name_locs(node)
+      if node.type == :symbol_node && node.opening_loc.nil?
+        @prism_method_name_locs[node.value_loc.start_offset] = true
       end
-      node.compact_child_nodes.each { |child| collect_method_call_locs(child) }
     end
 
     def ensure_literal_levels

data/lib/textbringer/themes/catppuccin.rb

@@ -2,70 +2,71 @@
 # Based on https://github.com/catppuccin/nvim
 #
 # Dark variant: Mocha    Light variant: Latte
+# GUI hex values from the official palette definitions.
 
 Textbringer::Theme.define "catppuccin" do |t|
   t.palette :dark do |p|
     # Catppuccin Mocha base tones
-    p.color :text,     hex: "#d7d7ff", ansi: "white"
-    p.color :subtext1, hex: "#afafd7", ansi: "white"
-    p.color :subtext0, hex: "#afafd7", ansi: "white"
-    p.color :overlay2, hex: "#8787af", ansi: "white"
-    p.color :overlay1, hex: "#8787af", ansi: "white"
-    p.color :overlay0, hex: "#767676", ansi: "brightblack"
-    p.color :surface2, hex: "#626262", ansi: "brightblack"
-    p.color :surface1, hex: "#4e4e4e", ansi: "brightblack"
-    p.color :surface0, hex: "#3a3a3a", ansi: "brightblack"
-    p.color :base,     hex: "#262626", ansi: "black"
-    p.color :mantle,   hex: "#1c1c1c", ansi: "black"
-    p.color :crust,    hex: "#121212", ansi: "black"
+    p.color :text,     hex: "#cdd6f4", ansi: "white"
+    p.color :subtext1, hex: "#bac2de", ansi: "white"
+    p.color :subtext0, hex: "#a6adc8", ansi: "white"
+    p.color :overlay2, hex: "#9399b2", ansi: "white"
+    p.color :overlay1, hex: "#7f849c", ansi: "brightblack"
+    p.color :overlay0, hex: "#6c7086", ansi: "brightblack"
+    p.color :surface2, hex: "#585b70", ansi: "brightblack"
+    p.color :surface1, hex: "#45475a", ansi: "brightblack"
+    p.color :surface0, hex: "#313244", ansi: "brightblack"
+    p.color :base,     hex: "#1e1e2e", ansi: "black"
+    p.color :mantle,   hex: "#181825", ansi: "black"
+    p.color :crust,    hex: "#11111b", ansi: "black"
 
     # Catppuccin Mocha accent colors
-    p.color :red,       hex: "#ff87af", ansi: "red"
-    p.color :maroon,    hex: "#d7afaf", ansi: "red"
-    p.color :peach,     hex: "#ffaf87", ansi: "yellow"
-    p.color :yellow,    hex: "#ffd7af", ansi: "yellow"
-    p.color :green,     hex: "#afd7af", ansi: "green"
-    p.color :teal,      hex: "#87d7d7", ansi: "cyan"
-    p.color :sky,       hex: "#87d7d7", ansi: "cyan"
-    p.color :sapphire,  hex: "#87d7ff", ansi: "cyan"
-    p.color :blue,      hex: "#87afff", ansi: "blue"
-    p.color :lavender,  hex: "#afafff", ansi: "blue"
-    p.color :mauve,     hex: "#d7afff", ansi: "magenta"
-    p.color :pink,      hex: "#ffafd7", ansi: "magenta"
-    p.color :flamingo,  hex: "#ffd7d7", ansi: "red"
-    p.color :rosewater, hex: "#ffd7d7", ansi: "red"
+    p.color :red,       hex: "#f38ba8", ansi: "red"
+    p.color :maroon,    hex: "#eba0ac", ansi: "red"
+    p.color :peach,     hex: "#fab387", ansi: "yellow"
+    p.color :yellow,    hex: "#f9e2af", ansi: "yellow"
+    p.color :green,     hex: "#a6e3a1", ansi: "green"
+    p.color :teal,      hex: "#94e2d5", ansi: "cyan"
+    p.color :sky,       hex: "#89dceb", ansi: "cyan"
+    p.color :sapphire,  hex: "#74c7ec", ansi: "cyan"
+    p.color :blue,      hex: "#89b4fa", ansi: "blue"
+    p.color :lavender,  hex: "#b4befe", ansi: "blue"
+    p.color :mauve,     hex: "#cba6f7", ansi: "magenta"
+    p.color :pink,      hex: "#f5c2e7", ansi: "magenta"
+    p.color :flamingo,  hex: "#f2cdcd", ansi: "red"
+    p.color :rosewater, hex: "#f5e0dc", ansi: "red"
   end
 
   t.palette :light do |p|
     # Catppuccin Latte base tones
-    p.color :text,     hex: "#585858", ansi: "black"
-    p.color :subtext1, hex: "#5f5f87", ansi: "black"
-    p.color :subtext0, hex: "#767676", ansi: "brightblack"
-    p.color :overlay2, hex: "#878787", ansi: "brightblack"
-    p.color :overlay1, hex: "#949494", ansi: "white"
-    p.color :overlay0, hex: "#a8a8a8", ansi: "white"
-    p.color :surface2, hex: "#b2b2b2", ansi: "white"
-    p.color :surface1, hex: "#c6c6c6", ansi: "white"
-    p.color :surface0, hex: "#d0d0d0", ansi: "white"
-    p.color :base,     hex: "#eeeeee", ansi: "white"
-    p.color :mantle,   hex: "#eeeeee", ansi: "white"
-    p.color :crust,    hex: "#e4e4e4", ansi: "white"
+    p.color :text,     hex: "#4c4f69", ansi: "black"
+    p.color :subtext1, hex: "#5c5f77", ansi: "black"
+    p.color :subtext0, hex: "#6c6f85", ansi: "brightblack"
+    p.color :overlay2, hex: "#7c7f93", ansi: "brightblack"
+    p.color :overlay1, hex: "#8c8fa1", ansi: "white"
+    p.color :overlay0, hex: "#9ca0b0", ansi: "white"
+    p.color :surface2, hex: "#acb0be", ansi: "white"
+    p.color :surface1, hex: "#bcc0cc", ansi: "white"
+    p.color :surface0, hex: "#ccd0da", ansi: "white"
+    p.color :base,     hex: "#eff1f5", ansi: "white"
+    p.color :mantle,   hex: "#e6e9ef", ansi: "white"
+    p.color :crust,    hex: "#dce0e8", ansi: "white"
 
     # Catppuccin Latte accent colors
-    p.color :red,       hex: "#d7005f", ansi: "red"
-    p.color :maroon,    hex: "#d75f5f", ansi: "red"
-    p.color :peach,     hex: "#ff5f00", ansi: "red"
-    p.color :yellow,    hex: "#d78700", ansi: "yellow"
-    p.color :green,     hex: "#5faf00", ansi: "green"
-    p.color :teal,      hex: "#008787", ansi: "cyan"
-    p.color :sky,       hex: "#00afd7", ansi: "cyan"
-    p.color :sapphire,  hex: "#00afaf", ansi: "cyan"
-    p.color :blue,      hex: "#005fff", ansi: "blue"
-    p.color :lavender,  hex: "#5f87ff", ansi: "blue"
-    p.color :mauve,     hex: "#875fff", ansi: "magenta"
-    p.color :pink,      hex: "#d787d7", ansi: "magenta"
-    p.color :flamingo,  hex: "#d78787", ansi: "red"
-    p.color :rosewater, hex: "#d78787", ansi: "red"
+    p.color :red,       hex: "#d20f39", ansi: "red"
+    p.color :maroon,    hex: "#e64553", ansi: "red"
+    p.color :peach,     hex: "#fe640b", ansi: "red"
+    p.color :yellow,    hex: "#df8e1d", ansi: "yellow"
+    p.color :green,     hex: "#40a02b", ansi: "green"
+    p.color :teal,      hex: "#179299", ansi: "cyan"
+    p.color :sky,       hex: "#04a5e5", ansi: "cyan"
+    p.color :sapphire,  hex: "#209fb5", ansi: "cyan"
+    p.color :blue,      hex: "#1e66f5", ansi: "blue"
+    p.color :lavender,  hex: "#7287fd", ansi: "blue"
+    p.color :mauve,     hex: "#8839ef", ansi: "magenta"
+    p.color :pink,      hex: "#ea76cb", ansi: "magenta"
+    p.color :flamingo,  hex: "#dd7878", ansi: "red"
+    p.color :rosewater, hex: "#dc8a78", ansi: "red"
   end
 
   t.default_colors foreground: :text, background: :base

data/lib/textbringer/themes/github.rb

@@ -2,34 +2,31 @@
 # Based on https://github.com/cormacrelf/vim-colors-github
 # Inspired by GitHub's syntax highlighting as of 2018.
 #
-# Light palette: cterm values from source (accurate).
-# Dark palette: GUI hex values — dark-mode cterm values in source are unreliable
-#   (e.g. dcolors.blue has cterm=167 which maps to red, overlay has cterm=123
-#    which maps to bright cyan).
+# GUI hex values from the source's guifg/guibg definitions.
 
 Textbringer::Theme.define "github" do |t|
   t.palette :light do |p|
     # Backgrounds / foreground
-    p.color :bg,       hex: "#ffffff", ansi: "white"        # 231  Normal bg
-    p.color :bg1,      hex: "#eeeeee", ansi: "white"        # 255  overlay/gutter/panels
-    p.color :vis,      hex: "#afd7ff", ansi: "blue"         # 153  Visual selection bg (blue2)
-    p.color :search,   hex: "#ffffd7", ansi: "yellow"       # 230  Search bg (yellow)
-    p.color :fg,       hex: "#262626", ansi: "black"        # 235  Normal fg (base0)
-    p.color :comment,  hex: "#767676", ansi: "brightblack"  # 243  Comment (base2)
-    p.color :line_nr,  hex: "#bcbcbc", ansi: "white"        # 250  LineNr fg (base4)
+    p.color :bg,       hex: "#ffffff", ansi: "white"        # Normal guibg
+    p.color :bg1,      hex: "#f6f8fa", ansi: "white"        # overlay/gutter (grey2)
+    p.color :vis,      hex: "#e4effb", ansi: "blue"         # Visual guibg (blue2)
+    p.color :search,   hex: "#ffffc5", ansi: "yellow"       # Search guibg
+    p.color :fg,       hex: "#24292e", ansi: "black"        # Normal guifg (base0)
+    p.color :comment,  hex: "#6a737d", ansi: "brightblack"  # Comment guifg (base2)
+    p.color :line_nr,  hex: "#babbbc", ansi: "white"        # LineNr guifg (base4)
 
     # Syntax colors
-    p.color :red,      hex: "#d75f5f", ansi: "red"          # 167  Statement, Type, PreProc
-    p.color :darkred,  hex: "#af0000", ansi: "red"          # 124  darkred
-    p.color :purple,   hex: "#8700af", ansi: "magenta"      #  91  Function, Define, Special
-    p.color :green,    hex: "#00875f", ansi: "green"        #  29  html/xml tags
-    p.color :orange,   hex: "#d75f00", ansi: "yellow"       # 166  orange
-    p.color :blue,     hex: "#005fd7", ansi: "blue"         #  26  Identifier, Constant, Macro
-    p.color :darkblue, hex: "#00005f", ansi: "blue"         #  17  String
+    p.color :red,      hex: "#d73a49", ansi: "red"          # Statement guifg
+    p.color :darkred,  hex: "#b31d28", ansi: "red"          # darkred
+    p.color :purple,   hex: "#6f42c1", ansi: "magenta"      # Function guifg
+    p.color :green,    hex: "#22863a", ansi: "green"        # html/xml tags
+    p.color :orange,   hex: "#e36209", ansi: "yellow"       # orange
+    p.color :blue,     hex: "#005cc5", ansi: "blue"         # Identifier guifg
+    p.color :darkblue, hex: "#032f62", ansi: "blue"         # String guifg
   end
 
   t.palette :dark do |p|
-    # Backgrounds / foreground (GUI hex — cterm values are unreliable in source)
+    # Backgrounds / foreground (GUI hex from dark mode definitions)
     p.color :bg,       hex: "#24292e", ansi: "black"        # base0 (Normal bg)
     p.color :bg1,      hex: "#353a3f", ansi: "brightblack"  # dcolors.overlay (panels/popups)
     p.color :vis,      hex: "#354a60", ansi: "blue"         # dcolors.blue2 / blues[4]
@@ -58,7 +55,7 @@ Textbringer::Theme.define "github" do |t|
   t.face :number,                   foreground: :blue      # Number → Constant = blue
   t.face :constant,                 foreground: :blue      # Constant = blue
   t.face :function_name,            foreground: :purple    # Function = purple
-  t.face :type,                     foreground: :orange    # Type = orange
+  t.face :type,                     foreground: :orange    # Type = orange (current GitHub style; vim source used red)
   t.face :variable,                 foreground: :blue      # Identifier = blue
   t.face :operator                                         # no explicit color in source
   t.face :punctuation                                      # Delimiter = fg (ghNormalNoBg)

data/lib/textbringer/themes/gruvbox.rb

@@ -1,50 +1,51 @@
 # Gruvbox theme for Textbringer
 # Based on https://github.com/morhetz/gruvbox
 #
+# GUI hex values from the source's guifg/guibg definitions.
 # Dark: bright accent colors on warm dark background
-# Light: neutral accent colors on warm light background
+# Light: faded accent colors on warm light background
 
 Textbringer::Theme.define "gruvbox" do |t|
   t.palette :dark do |p|
     # Base tones (dark background, light foreground)
-    p.color :bg0,  hex: "#262626", ansi: "black"
-    p.color :bg1,  hex: "#3a3a3a", ansi: "brightblack"
-    p.color :bg2,  hex: "#4e4e4e", ansi: "brightblack"
-    p.color :bg3,  hex: "#626262", ansi: "brightblack"
-    p.color :bg4,  hex: "#767676", ansi: "white"
-    p.color :fg1,  hex: "#ffd7af", ansi: "white"
-    p.color :fg4,  hex: "#949494", ansi: "white"
-    p.color :gray, hex: "#8a8a8a", ansi: "white"
+    p.color :bg0,  hex: "#282828", ansi: "black"        # dark0
+    p.color :bg1,  hex: "#3c3836", ansi: "brightblack"  # dark1
+    p.color :bg2,  hex: "#504945", ansi: "brightblack"  # dark2
+    p.color :bg3,  hex: "#665c54", ansi: "brightblack"  # dark3
+    p.color :bg4,  hex: "#7c6f64", ansi: "white"        # dark4
+    p.color :fg1,  hex: "#ebdbb2", ansi: "white"        # light1 (Normal guifg)
+    p.color :fg4,  hex: "#a89984", ansi: "white"        # light4
+    p.color :gray, hex: "#928374", ansi: "white"        # gray_245
 
     # Bright accent colors
-    p.color :red,    hex: "#d75f5f", ansi: "red"
-    p.color :green,  hex: "#afaf00", ansi: "green"
-    p.color :yellow, hex: "#ffaf00", ansi: "yellow"
-    p.color :blue,   hex: "#87afaf", ansi: "blue"
-    p.color :purple, hex: "#d787af", ansi: "magenta"
-    p.color :aqua,   hex: "#87af87", ansi: "cyan"
-    p.color :orange, hex: "#ff8700", ansi: "yellow"
+    p.color :red,    hex: "#fb4934", ansi: "red"        # bright_red
+    p.color :green,  hex: "#b8bb26", ansi: "green"      # bright_green
+    p.color :yellow, hex: "#fabd2f", ansi: "yellow"     # bright_yellow
+    p.color :blue,   hex: "#83a598", ansi: "blue"       # bright_blue
+    p.color :purple, hex: "#d3869b", ansi: "magenta"    # bright_purple
+    p.color :aqua,   hex: "#8ec07c", ansi: "cyan"       # bright_aqua
+    p.color :orange, hex: "#fe8019", ansi: "yellow"     # bright_orange
   end
 
   t.palette :light do |p|
     # Base tones (light background, dark foreground)
-    p.color :bg0,  hex: "#ffffaf", ansi: "white"
-    p.color :bg1,  hex: "#ffd7af", ansi: "white"
-    p.color :bg2,  hex: "#bcbcbc", ansi: "white"
-    p.color :bg3,  hex: "#a8a8a8", ansi: "white"
-    p.color :bg4,  hex: "#949494", ansi: "brightblack"
-    p.color :fg1,  hex: "#3a3a3a", ansi: "black"
-    p.color :fg4,  hex: "#767676", ansi: "brightblack"
-    p.color :gray, hex: "#8a8a8a", ansi: "brightblack"
+    p.color :bg0,  hex: "#fbf1c7", ansi: "white"        # light0
+    p.color :bg1,  hex: "#ebdbb2", ansi: "white"        # light1
+    p.color :bg2,  hex: "#d5c4a1", ansi: "white"        # light2
+    p.color :bg3,  hex: "#bdae93", ansi: "white"        # light3
+    p.color :bg4,  hex: "#a89984", ansi: "brightblack"  # light4
+    p.color :fg1,  hex: "#3c3836", ansi: "black"        # dark1 (Normal guifg)
+    p.color :fg4,  hex: "#7c6f64", ansi: "brightblack"  # dark4
+    p.color :gray, hex: "#928374", ansi: "brightblack"  # gray_244
 
-    # Neutral accent colors
-    p.color :red,    hex: "#af0000", ansi: "red"
-    p.color :green,  hex: "#87af00", ansi: "green"
-    p.color :yellow, hex: "#d78700", ansi: "yellow"
-    p.color :blue,   hex: "#5f8787", ansi: "blue"
-    p.color :purple, hex: "#af5f87", ansi: "magenta"
-    p.color :aqua,   hex: "#5faf87", ansi: "cyan"
-    p.color :orange, hex: "#d75f00", ansi: "red"
+    # Faded accent colors
+    p.color :red,    hex: "#9d0006", ansi: "red"        # faded_red
+    p.color :green,  hex: "#79740e", ansi: "green"      # faded_green
+    p.color :yellow, hex: "#b57614", ansi: "yellow"     # faded_yellow
+    p.color :blue,   hex: "#076678", ansi: "blue"       # faded_blue
+    p.color :purple, hex: "#8f3f71", ansi: "magenta"    # faded_purple
+    p.color :aqua,   hex: "#427b58", ansi: "cyan"       # faded_aqua
+    p.color :orange, hex: "#af3a03", ansi: "red"        # faded_orange
   end
 
   t.default_colors foreground: :fg1, background: :bg0
@@ -56,7 +57,7 @@ Textbringer::Theme.define "gruvbox" do |t|
   t.face :string,                 foreground: :green
   t.face :number,                 foreground: :purple
   t.face :constant,               foreground: :purple
-  t.face :function_name,          foreground: :green
+  t.face :function_name,          foreground: :green,  bold: true
   t.face :type,                   foreground: :yellow
   t.face :variable,               foreground: :blue
   t.face :operator

data/lib/textbringer/themes/molokai.rb

@@ -2,29 +2,30 @@
 # Based on https://github.com/tomasr/molokai
 # Original Monokai theme by Wimer Hazenberg; darker variant by Hamish Stuart Macpherson
 #
-# Colors derived from molokai's 256-color (cterm) values.
-# Dark only.
+# GUI hex values from the source's guifg/guibg definitions.
+# Dark only (default darker variant, s:molokai_original = 0).
 
 Textbringer::Theme.define "molokai" do |t|
   t.palette :dark do |p|
-    # Background / foreground  (cterm numbers in comments)
-    p.color :bg,      hex: "#121212", ansi: "black"        # 233  Normal bg
-    p.color :bg1,     hex: "#262626", ansi: "brightblack"  # 235  Visual, region
-    p.color :bg2,     hex: "#303030", ansi: "brightblack"  # 236  LineNr bg, floating windows
-    p.color :fg,      hex: "#d0d0d0", ansi: "white"        # 252  Normal fg
-    p.color :comment, hex: "#5f5f5f", ansi: "brightblack"  #  59  Comment
-    p.color :gray,    hex: "#444444", ansi: "brightblack"  # 238  StatusLine fg
-    p.color :silver,  hex: "#dadada", ansi: "white"        # 253  StatusLine bg
-    p.color :mid_gray, hex: "#6c6c6c", ansi: "brightblack" # 242  PmenuSel bg
+    # Background / foreground
+    p.color :bg,      hex: "#1b1d1e", ansi: "black"        # Normal guibg
+    p.color :bg1,     hex: "#403d3d", ansi: "brightblack"   # Visual guibg
+    p.color :bg2,     hex: "#1b1d1e", ansi: "black"         # floating window bg (same as bg)
+    p.color :fg,      hex: "#f8f8f2", ansi: "white"         # Normal guifg
+    p.color :comment, hex: "#7e8e91", ansi: "brightblack"   # Comment guifg
+    p.color :gray,    hex: "#455354", ansi: "brightblack"    # StatusLine guifg
+    p.color :silver,  hex: "#f8f8f2", ansi: "white"         # StatusLine guibg = fg
+    p.color :mid_gray, hex: "#808080", ansi: "brightblack"  # PmenuSel guibg
+    p.color :delim,   hex: "#8f8f8f", ansi: "white"         # Delimiter guifg
 
     # Accent colors
-    p.color :pink,    hex: "#d7005f", ansi: "red"          # 161  Keyword, Operator
-    p.color :green,   hex: "#87ff00", ansi: "green"        # 118  Function, PreProc
-    p.color :yellow,  hex: "#afaf87", ansi: "yellow"       # 144  String, Character
-    p.color :purple,  hex: "#af5fff", ansi: "magenta"      # 135  Number, Boolean, Constant
-    p.color :orange,  hex: "#ff8700", ansi: "yellow"       # 208  Identifier, StorageClass
-    p.color :cyan,    hex: "#5fd7ff", ansi: "cyan"         #  81  Type, Define, Structure
-    p.color :search,  hex: "#ffd787", ansi: "yellow"       # 222  Search bg
+    p.color :pink,    hex: "#f92672", ansi: "red"           # Keyword guifg
+    p.color :green,   hex: "#a6e22e", ansi: "green"         # Function guifg
+    p.color :yellow,  hex: "#e6db74", ansi: "yellow"        # String guifg
+    p.color :purple,  hex: "#ae81ff", ansi: "magenta"       # Number guifg
+    p.color :orange,  hex: "#fd971f", ansi: "yellow"        # Identifier guifg
+    p.color :cyan,    hex: "#66d9ef", ansi: "cyan"          # Type guifg
+    p.color :search,  hex: "#ffe792", ansi: "yellow"        # Search guibg
   end
 
   t.default_colors foreground: :fg, background: :bg
@@ -40,22 +41,19 @@ Textbringer::Theme.define "molokai" do |t|
   t.face :type,                     foreground: :cyan
   t.face :variable,                 foreground: :orange
   t.face :operator,                 foreground: :pink
-  t.face :punctuation
+  t.face :punctuation,              foreground: :delim
   t.face :builtin,                  foreground: :cyan
   t.face :property,                 foreground: :orange
 
   # Basic faces
-  # StatusLine: ctermfg=238 (#444444) on ctermbg=253 (#DADADA)
   t.face :mode_line,                foreground: :gray,     background: :silver
   t.face :link,                     foreground: :cyan,     underline: true
   t.face :control
   t.face :region,                   background: :bg1
-  # Search: ctermfg=0 ctermbg=222
   t.face :isearch,                  foreground: :bg,       background: :search
   t.face :floating_window,          foreground: :fg,       background: :bg2
 
   # Completion faces
-  # Pmenu: ctermfg=81 ctermbg=16;  PmenuSel: ctermfg=252 ctermbg=242
   t.face :completion_popup,          foreground: :cyan,    background: :bg
   t.face :completion_popup_selected, foreground: :fg,      background: :mid_gray
 

data/lib/textbringer/themes/sonokai.rb

@@ -1,29 +1,33 @@
 # Sonokai theme for Textbringer (default style)
 # Based on https://github.com/sainnhe/sonokai
 #
+# GUI hex values from the source's default style palette.
 # A dark theme only. Falls back to dark palette on light terminals.
 
 Textbringer::Theme.define "sonokai" do |t|
   t.palette :dark do |p|
     # Base tones
-    p.color :black,    hex: "#080808", ansi: "black"
-    p.color :bg_dim,   hex: "#080808", ansi: "black"
-    p.color :bg0,      hex: "#262626", ansi: "black"
-    p.color :bg1,      hex: "#303030", ansi: "brightblack"
-    p.color :bg2,      hex: "#303030", ansi: "brightblack"
-    p.color :bg3,      hex: "#3a3a3a", ansi: "brightblack"
-    p.color :bg4,      hex: "#3a3a3a", ansi: "brightblack"
-    p.color :fg,       hex: "#bcbcbc", ansi: "white"
-    p.color :grey,     hex: "#949494", ansi: "white"
-    p.color :grey_dim, hex: "#585858", ansi: "brightblack"
+    p.color :black,    hex: "#181819", ansi: "black"
+    p.color :bg_dim,   hex: "#222327", ansi: "black"
+    p.color :bg0,      hex: "#2c2e34", ansi: "black"
+    p.color :bg1,      hex: "#33353f", ansi: "brightblack"
+    p.color :bg2,      hex: "#363944", ansi: "brightblack"
+    p.color :bg3,      hex: "#3b3e48", ansi: "brightblack"
+    p.color :bg4,      hex: "#414550", ansi: "brightblack"
+    p.color :fg,       hex: "#e2e2e3", ansi: "white"
+    p.color :grey,     hex: "#7f8490", ansi: "white"
+    p.color :grey_dim, hex: "#595f6f", ansi: "brightblack"
 
     # Accent colors
-    p.color :red,      hex: "#ff5f5f", ansi: "red"
-    p.color :orange,   hex: "#ffaf5f", ansi: "yellow"
-    p.color :yellow,   hex: "#d7af5f", ansi: "yellow"
-    p.color :green,    hex: "#87af5f", ansi: "green"
-    p.color :blue,     hex: "#87afd7", ansi: "cyan"
-    p.color :purple,   hex: "#d787d7", ansi: "magenta"
+    p.color :red,      hex: "#fc5d7c", ansi: "red"
+    p.color :orange,   hex: "#f39660", ansi: "yellow"
+    p.color :yellow,   hex: "#e7c664", ansi: "yellow"
+    p.color :green,    hex: "#9ed072", ansi: "green"
+    p.color :blue,     hex: "#76cce0", ansi: "cyan"
+    p.color :purple,   hex: "#b39df3", ansi: "magenta"
+
+    # Filled colors for UI
+    p.color :filled_blue, hex: "#85d3f2", ansi: "cyan"
   end
 
   t.default_colors foreground: :fg, background: :bg0
@@ -48,12 +52,12 @@ Textbringer::Theme.define "sonokai" do |t|
   t.face :link,                   foreground: :blue, underline: true
   t.face :control
   t.face :region,                 background: :bg4
-  t.face :isearch,                foreground: :bg0, background: :green
+  t.face :isearch,                foreground: :green, background: :bg0, reverse: true
   t.face :floating_window,        foreground: :fg, background: :bg_dim
 
   # Completion faces
   t.face :completion_popup,          foreground: :fg, background: :bg2
-  t.face :completion_popup_selected, foreground: :bg0, background: :blue
+  t.face :completion_popup_selected, foreground: :bg0, background: :filled_blue
 
   # Dired faces
   t.face :dired_directory,   foreground: :green

data/lib/textbringer/themes/tokyonight.rb

@@ -1,7 +1,7 @@
 # Tokyo Night theme for Textbringer
 # Based on https://github.com/folke/tokyonight.nvim
-# Night variant (dark only). GUI hex colors — no cterm values in source.
-# Computed colors derived from tokyonight's blend formulas.
+# Night variant (dark only).
+# GUI hex values from the source palette definitions.
 
 Textbringer::Theme.define "tokyonight" do |t|
   t.palette :dark do |p|
@@ -9,7 +9,7 @@ Textbringer::Theme.define "tokyonight" do |t|
     p.color :bg,      hex: "#1a1b26", ansi: "black"        # bg
     p.color :bg_dark, hex: "#16161e", ansi: "black"        # bg_dark → popups, statusline
     p.color :bg_hl,   hex: "#292e42", ansi: "brightblack"  # bg_highlight → floating windows
-    p.color :bg_vis,  hex: "#283457", ansi: "brightblack"  # bg_visual = blend(blue0, 0.4, bg)
+    p.color :bg_vis,  hex: "#283357", ansi: "brightblack"  # bg_visual = blend(blue0, 0.4, bg)
     p.color :sel_bg,  hex: "#343a55", ansi: "brightblack"  # PmenuSel bg = blend(fg_gutter, 0.8, bg)
     p.color :search,  hex: "#3d59a1", ansi: "blue"         # bg_search = blue0
     p.color :fg,      hex: "#c0caf5", ansi: "white"        # fg

data/lib/textbringer/utils.rb

@@ -418,6 +418,22 @@ module Textbringer
       RbConfig::CONFIG["ruby_install_name"]
     end
 
+    def with_clean_env(&block)
+      env = ENV.to_h.reject { |k, _| k.start_with?("RBENV_") }
+      unless Gem.win_platform?
+        env["PATH"] = env["PATH"].split(File::PATH_SEPARATOR).reject { |path|
+          /.rbenv\/(versions|libexec)/.match?(path)
+        }.join(File::PATH_SEPARATOR)
+      end
+      if defined?(Bundler)
+        Bundler.with_unbundled_env do
+          block.call(env)
+        end
+      else
+        block.call(env)
+      end
+    end
+
     [
       :beginning_of_buffer?,
       :end_of_buffer?,

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "25"
+  VERSION = "26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '25'
+  version: '26'
 platform: ruby
 authors:
 - Shugo Maeda