textbringer 12 → 14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04d0f8e23504a6d3ae1ce1ccc4cf1ca4c8308525cd61356d22e50631474408bc
-  data.tar.gz: a16eefeef6df621bf2272a4437b1321c999b7ffd3f0cf7f1353d0a41baabd7b6
+  metadata.gz: 8b974ebb2c6338de9890aee4aa219529d5d81f9b838b21bb6e738ddf205015d5
+  data.tar.gz: fe3ed3ec2825a26e9e0c6eaa777a6e5c53549ac604ffe38eceb653ca2e6ef6b2
 SHA512:
-  metadata.gz: f03f8d34e41b099d3b9dcaecbb1fa40b3e9c9f3c43a7aba7917dcfe8a7cccbd1dec97599c46e657839af70d8abf67681f339d5ba97f6abb308e76fe1ffbd93f0
-  data.tar.gz: 643f15490cc3ce708c8b6aced38b1249b7c4074a6a5fcb9c7fd927ee1493778fdefd9c9f393a968630e89a85823e13deb036c481691651b02580b2bc150a1a14
+  metadata.gz: ddcdd02dc9fd8d7397ef7994d000d470268aff0052dcab907a2a6cb073a9f39847180c1dfc40984e36d19e4bd64459cdeed8ab6ba493cdf4d1df542d9f4ac3cb
+  data.tar.gz: cf0095973d9e53072a6243568ffe70aaf3a33b5091767c00ff0064ed9dcfc7f0f9c053b7d146abf69ec0cacb88f4495f16a283e05383246a4a84a001413b8cfd

data/lib/textbringer/buffer.rb

@@ -550,6 +550,7 @@ module Textbringer
     end
 
     def goto_char(pos)
+      return pos if pos == @point
       if pos < 0 || pos > size
         raise RangeError, "Out of buffer"
       end
@@ -1089,185 +1090,6 @@ module Textbringer
       insert_for_yank(KILL_RING.rotate(1))
     end
 
-    def rectangle_boundaries(s = @point, e = mark)
-      s, e = Buffer.region_boundaries(s, e)
-      save_excursion do
-        goto_char(s)
-        start_line = @current_line
-        beginning_of_line
-        start_col = display_width(substring(@point, s)) + 1
-        goto_char(e)
-        end_line = @current_line
-        beginning_of_line
-        end_col = display_width(substring(@point, e)) + 1
-
-        # Ensure start_col <= end_col
-        if start_col > end_col
-          start_col, end_col = end_col, start_col
-        end
-        [start_line, start_col, end_line, end_col]
-      end
-    end
-
-    def extract_rectangle(s = @point, e = mark)
-      start_line, start_col, end_line, end_col = rectangle_boundaries(s, e)
-      lines = []
-      rectangle_width = end_col - start_col
-
-      save_excursion do
-        goto_line(start_line)
-        (start_line..end_line).each do |line_num|
-          beginning_of_line
-          line_start = @point
-
-          # Move to start column
-          col = 1
-          while col < start_col && !end_of_line?
-            forward_char
-            col = 1 + display_width(substring(line_start, @point))
-          end
-          start_pos = @point
-
-          # If we haven't reached start_col, the line is too short
-          if col < start_col
-            # Line is shorter than start column, extract all spaces
-            lines << " " * rectangle_width
-          else
-            # Move to end column
-            while col < end_col && !end_of_line?
-              forward_char
-              col = 1 + display_width(substring(line_start, @point))
-            end
-            end_pos = @point
-
-            # Extract the rectangle text for this line
-            if end_pos > start_pos
-              extracted = substring(start_pos, end_pos)
-              # Pad with spaces if the extracted text is shorter than rectangle width
-              extracted_width = display_width(extracted)
-              if extracted_width < rectangle_width
-                extracted += " " * (rectangle_width - extracted_width)
-              end
-              lines << extracted
-            else
-              lines << " " * rectangle_width
-            end
-          end
-
-          # Move to next line
-          break if line_num == end_line
-          forward_line
-        end
-      end
-
-      lines
-    end
-
-    def copy_rectangle(s = @point, e = mark)
-      lines = extract_rectangle(s, e)
-      @@killed_rectangle = lines
-    end
-
-    def kill_rectangle(s = @point, e = mark)
-      copy_rectangle(s, e)
-      delete_rectangle(s, e)
-    end
-
-    def delete_rectangle(s = @point, e = mark)
-      check_read_only_flag
-      start_line, start_col, end_line, end_col = rectangle_boundaries(s, e)
-
-      save_excursion do
-        # Delete from bottom to top to avoid position shifts
-        (start_line..end_line).reverse_each do |line_num|
-          goto_line(line_num)
-          beginning_of_line
-          line_start = @point
-
-          # Move to start column
-          col = 1
-          while col < start_col && !end_of_line?
-            forward_char
-            col = 1 + display_width(substring(line_start, @point))
-          end
-          start_pos = @point
-
-          # Only delete if we're within the line bounds
-          if col >= start_col
-            # Move to end column
-            while col < end_col && !end_of_line?
-              forward_char
-              col = 1 + display_width(substring(line_start, @point))
-            end
-            end_pos = @point
-
-            # Delete the rectangle text for this line
-            if end_pos > start_pos
-              delete_region(start_pos, end_pos)
-            end
-          end
-        end
-      end
-    end
-
-    def yank_rectangle
-      raise "No rectangle in kill ring" if @@killed_rectangle.nil?
-      lines = @@killed_rectangle
-      start_line, start_col = get_line_and_column(@point)
-
-      save_excursion do
-        lines.each_with_index do |line, i|
-          goto_line(start_line + i)
-          beginning_of_line
-          line_start = @point
-
-          # Move to start column, extending line if necessary
-          col = 1
-          while col < start_col && !end_of_line?
-            forward_char
-            col = 1 + display_width(substring(line_start, @point))
-          end
-
-          # If line is shorter than start_col, extend it with spaces
-          if col < start_col
-            insert(" " * (start_col - col))
-          end
-
-          # Insert the rectangle line
-          insert(line)
-        end
-      end
-    end
-
-    def open_rectangle(s = @point, e = mark)
-      check_read_only_flag
-      start_line, start_col, end_line, end_col = rectangle_boundaries(s, e)
-      width = end_col - start_col
-
-      save_excursion do
-        (start_line..end_line).each do |line_num|
-          goto_line(line_num)
-          beginning_of_line
-          line_start = @point
-
-          # Move to start column, extending line if necessary
-          col = 1
-          while col < start_col && !end_of_line?
-            forward_char
-            col = 1 + display_width(substring(line_start, @point))
-          end
-
-          # If line is shorter than start_col, extend it with spaces
-          if col < start_col
-            insert(" " * (start_col - col))
-          end
-
-          # Insert spaces to create the rectangle
-          insert(" " * width)
-        end
-      end
-    end
-
     def undo
       undo_or_redo(:undo, @undo_stack, @redo_stack)
     end
@@ -1276,7 +1098,7 @@ module Textbringer
       undo_or_redo(:redo, @redo_stack, @undo_stack)
     end
 
-    def re_search_forward(s, raise_error: true, count: 1)
+    def re_search_forward(s, raise_error: true, goto_beginning: false, count: 1)
       if count < 0
         return re_search_backward(s, raise_error: raise_error, count: -count)
       end
@@ -1291,7 +1113,7 @@ module Textbringer
             return nil
           end
         end
-        pos = match_end(0)
+        pos = goto_beginning ? match_beginning(0) : match_end(0)
       end
       goto_char(pos)
     end
@@ -1435,14 +1257,14 @@ module Textbringer
     end
 
     def composite_edit
+      location = @point
       @composite_edit_level += 1
       begin
         yield
       ensure
         @composite_edit_level -= 1
         if @composite_edit_level == 0 && !@composite_edit_actions.empty?
-          action = CompositeAction.new(self,
-                                       @composite_edit_actions.first.location)
+          action = CompositeAction.new(self, location)
           @composite_edit_actions.each do |i|
             action.add_action(i)
           end
@@ -1929,7 +1751,6 @@ module Textbringer
   end
 
   KILL_RING = Ring.new
-  @@killed_rectangle = nil
 
   class UndoableAction
     attr_accessor :version
@@ -2006,6 +1827,7 @@ module Textbringer
       @actions.reverse_each do |action|
         action.undo
       end
+      @buffer.goto_char(@location)
     end
 
     def redo

data/lib/textbringer/commands/buffers.rb

@@ -129,31 +129,6 @@ module Textbringer
       Buffer.current.delete_region
     end
 
-    define_command(:kill_rectangle,
-                   doc: "Kill the text of the region-rectangle, saving its contents as the last killed rectangle.") do
-      Buffer.current.kill_rectangle
-    end
-
-    define_command(:copy_rectangle_as_kill,
-                   doc: "Save the text of the region-rectangle as the last killed rectangle.") do
-      Buffer.current.copy_rectangle
-    end
-
-    define_command(:delete_rectangle,
-                   doc: "Delete the text of the region-rectangle.") do
-      Buffer.current.delete_rectangle
-    end
-
-    define_command(:yank_rectangle,
-                   doc: "Yank the last killed rectangle with its upper left corner at point.") do
-      Buffer.current.yank_rectangle
-    end
-
-    define_command(:open_rectangle,
-                   doc: "Insert blank space to fill the space of the region-rectangle. This pushes the previous contents of the region-rectangle to the right.") do
-      Buffer.current.open_rectangle
-    end
-
     define_command(:transpose_chars,
                    doc: "Transpose characters.") do
       Buffer.current.transpose_chars

data/lib/textbringer/commands/ispell.rb

@@ -0,0 +1,213 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module Textbringer
+  module Commands
+    class Ispell
+      def initialize
+        @personal_dictionary_modified = false
+        @stdin, @stdout, @stderr, @wait_thr =
+          Open3.popen3("aspell -a")
+        @stdout.gets # consume the banner
+      end
+
+      def check_word(word)
+        send_command("^" + word)
+        result = @stdout.gets
+        @stdout.gets
+        case result
+        when /\A&\s+([^\s]+)\s+\d+\s+\d+:\s+(.*)/
+          [$1, $2.split(/, /)]
+        when /\A\*/, /\A\+/, /\A\-/, /\A\%/
+          [word, []]
+        when /\A#/
+          [word, nil]
+        else
+          raise "unexpected output from aspell: #{result}"
+        end
+      end
+
+      def add_to_session_dictionary(word)
+        send_command("@" + word)
+      end
+
+      def add_to_personal_dictionary(word)
+        send_command("*" + word)
+        @personal_dictionary_modified = true
+      end
+
+      def personal_dictionary_modified?
+        @personal_dictionary_modified
+      end
+
+      def save_personal_dictionary
+        send_command("#")
+      end
+
+      def send_command(line)
+        @stdin.puts(line)
+        @stdin.flush
+      end
+
+      def close
+        @stdin.close
+        @stdout.close
+        @stderr.close
+      end
+    end
+
+    define_keymap :ISPELL_MODE_MAP
+    (?\x20..?\x7e).each do |c|
+      ISPELL_MODE_MAP.define_key(c, :ispell_unknown_command)
+    end
+    ISPELL_MODE_MAP.define_key(?\t, :ispell_unknown_command)
+    ISPELL_MODE_MAP.handle_undefined_key do |key|
+      ispell_unknown_command
+    end
+    ISPELL_MODE_MAP.define_key(?r, :ispell_replace)
+    ISPELL_MODE_MAP.define_key(?a, :ispell_accept)
+    ISPELL_MODE_MAP.define_key(?i, :ispell_insert)
+    ISPELL_MODE_MAP.define_key(" ", :ispell_skip)
+    ISPELL_MODE_MAP.define_key(?q, :ispell_quit)
+
+    ISPELL_STATUS = {}
+
+    ISPELL_WORD_REGEXP = /[A-Za-z]+/
+
+    define_command(:ispell_word) do
+      buffer = Buffer.current
+      word = buffer.save_excursion {
+        while !buffer.beginning_of_buffer? && buffer.char_after =~ /[A-Za-z]/
+          buffer.backward_char
+        end
+        buffer.re_search_forward(/[A-Za-z]+/, raise_error: false) &&
+          buffer.match_string(0)
+      }
+      if word.nil?
+        message("No word at point.")
+        return
+      end
+      start_pos = buffer.match_beginning(0)
+      end_pos = buffer.match_end(0)
+      ispell = Ispell.new
+      begin
+        _original, suggestions = ispell.check_word(word)
+        if suggestions.nil? || suggestions.empty?
+          message("#{word.inspect} is spelled correctly.")
+        else
+          s = read_from_minibuffer("Correct #{word} with: ",
+                                   completion_proc: ->(s) {
+                                     suggestions.grep(/^#{Regexp.quote(s)}/)
+                                   })
+          if s
+            buffer.composite_edit do
+              buffer.delete_region(start_pos, end_pos)
+              buffer.insert(s)
+            end
+          end
+        end
+      ensure
+        ispell.close
+      end
+    end
+
+    define_command(:ispell_buffer) do |recursive_edit: false|
+      Buffer.current.beginning_of_buffer
+      ispell_mode
+      ispell_forward
+      ISPELL_STATUS[:recursive_edit] = recursive_edit
+      if recursive_edit
+        recursive_edit()
+      end
+    end
+
+    def ispell_done
+      Buffer.current.delete_visible_mark
+      Controller.current.overriding_map = nil
+      ISPELL_STATUS[:ispell]&.close
+      ISPELL_STATUS[:ispell] = nil
+      if ISPELL_STATUS[:recursive_edit]
+        exit_recursive_edit
+      end
+    end
+
+    def ispell_mode
+      ISPELL_STATUS[:ispell] = Ispell.new
+      Controller.current.overriding_map = ISPELL_MODE_MAP
+    end
+
+    def ispell_forward
+      buffer = Buffer.current
+      while buffer.re_search_forward(ISPELL_WORD_REGEXP, raise_error: false,
+                                     goto_beginning: true)
+        ispell_beginning = buffer.point
+        buffer.set_visible_mark
+        buffer.goto_char(buffer.match_end(0))
+        word = buffer.match_string(0)
+        _original, suggestions = ISPELL_STATUS[:ispell].check_word(word)
+        if !suggestions.nil? && !suggestions.empty?
+          ISPELL_STATUS[:beginning] = ispell_beginning
+          ISPELL_STATUS[:word] = word
+          ISPELL_STATUS[:suggestions] = suggestions
+          message("Mispelled: #{word}  [r]eplace, [a]ccept, [i]nsert, [SPC] to skip, [q]uit")
+          recenter
+          return
+        end
+      end
+      Controller.current.overriding_map = nil
+      if ISPELL_STATUS[:ispell]&.personal_dictionary_modified? &&
+          y_or_n?("Personal dictionary modified.  Save?")
+        ISPELL_STATUS[:ispell].save_personal_dictionary
+      end
+      message("Finished spelling check.")
+      ispell_done
+    end
+
+    define_command(:ispell_replace) do
+      word = ISPELL_STATUS[:word]
+      suggestions = ISPELL_STATUS[:suggestions]
+      Controller.current.overriding_map = nil
+      s = read_from_minibuffer("Correct #{word} with: ",
+                               completion_proc: ->(s) {
+        suggestions.grep(/^#{Regexp.quote(s)}/)
+      })
+      Controller.current.overriding_map = ISPELL_MODE_MAP
+      if !s.empty?
+        buffer = Buffer.current
+        pos = buffer.point
+        buffer.goto_char(ISPELL_STATUS[:beginning])
+        buffer.composite_edit do
+          buffer.delete_region(buffer.point, pos)
+          buffer.insert(s)
+        end
+      end
+      ispell_forward
+    end
+
+    define_command(:ispell_accept) do
+      ISPELL_STATUS[:ispell].add_to_session_dictionary(ISPELL_STATUS[:word])
+      ispell_forward
+    end
+
+    define_command(:ispell_insert) do
+      ISPELL_STATUS[:ispell].add_to_personal_dictionary(ISPELL_STATUS[:word])
+      ispell_forward
+    end
+
+    define_command(:ispell_skip) do
+      ispell_forward
+    end
+
+    define_command(:ispell_quit) do
+      message("Quitting spell check.")
+      ispell_done
+    end
+
+    define_command(:ispell_unknown_command) do
+      word = ISPELL_STATUS[:word]
+      message("Mispelled: #{word}  [r]eplace, [a]ccept, [i]nsert, [SPC] to skip, [q]uit")
+      Window.beep
+    end
+  end
+end

data/lib/textbringer/commands/rectangle.rb

@@ -0,0 +1,290 @@
+module Textbringer::Buffer::RectangleMethods
+  SHARED_VALUES = {}
+
+  refine Textbringer::Buffer do
+    # Returns start_line, start_col, end_line, and end_col of the rectangle region
+    # Note that start_col and end_col are 0-origin and width-based (neither 1-origin nor codepoint-based)
+    def rectangle_boundaries(s = @point, e = mark)
+      s, e = Buffer.region_boundaries(s, e)
+      save_excursion do
+        goto_char(s)
+        start_line = @current_line
+        beginning_of_line
+        start_col = display_width(substring(@point, s))
+        goto_char(e)
+        end_line = @current_line
+        beginning_of_line
+        end_col = display_width(substring(@point, e))
+
+        # Ensure start_col <= end_col
+        if start_col > end_col
+          start_col, end_col = end_col, start_col
+        end
+        [start_line, start_col, end_line, end_col]
+      end
+    end
+
+    def apply_on_rectangle(s = @point, e = mark)
+      start_line, start_col, end_line, end_col = rectangle_boundaries(s, e)
+
+      save_excursion do
+        composite_edit do
+          goto_line(start_line)
+
+          loop do
+            beginning_of_line
+            line_start = @point
+
+            # Move to start column
+            col = 0
+            while col < start_col && !end_of_line?
+              forward_char
+              col = display_width(substring(line_start, @point))
+            end
+
+            yield(start_col, end_col, col, line_start, start_line, end_line)
+
+            # Move to next line for forward iteration
+            break if @current_line >= end_line
+            forward_line
+          end
+        end
+      end
+    end
+
+    def extract_rectangle(s = @point, e = mark)
+      lines = []
+      apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
+        start_pos = @point
+        width = end_col - start_col
+
+        # If we haven't reached start_col, the line is too short
+        if col < start_col
+          # Line is shorter than start column, extract all spaces
+          lines << " " * width
+        else
+          # Move to end column
+          while col < end_col && !end_of_line?
+            forward_char
+            col = display_width(substring(line_start, @point))
+          end
+          end_pos = @point
+
+          # Extract the rectangle text for this line
+          if end_pos > start_pos
+            extracted = substring(start_pos, end_pos)
+            # Pad with spaces if the extracted text is shorter than rectangle width
+            extracted_width = display_width(extracted)
+            if extracted_width < width
+              extracted += " " * (width - extracted_width)
+            end
+            lines << extracted
+          else
+            lines << " " * width
+          end
+        end
+      end
+
+      lines
+    end
+
+    def copy_rectangle(s = @point, e = mark)
+      lines = extract_rectangle(s, e)
+      SHARED_VALUES[:killed_rectangle] = lines
+    end
+
+    def kill_rectangle(s = @point, e = mark)
+      copy_rectangle(s, e)
+      delete_rectangle(s, e)
+    end
+
+    def delete_rectangle(s = @point, e = mark)
+      check_read_only_flag
+
+      apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
+        start_pos = @point
+
+        # Only delete if we're within the line bounds
+        if col >= start_col
+          # Move to end column
+          while col < end_col && !end_of_line?
+            forward_char
+            col = display_width(substring(line_start, @point))
+          end
+          end_pos = @point
+
+          # Delete the rectangle text for this line
+          if end_pos > start_pos
+            delete_region(start_pos, end_pos)
+          end
+        end
+      end
+    end
+
+    def yank_rectangle
+      raise "No rectangle in kill ring" if SHARED_VALUES[:killed_rectangle].nil?
+      lines = SHARED_VALUES[:killed_rectangle]
+      start_line = @current_line
+      start_point = @point
+      start_col = save_excursion {
+        beginning_of_line
+        display_width(substring(@point, start_point))
+      }
+      composite_edit do
+        lines.each_with_index do |line, i|
+          goto_line(start_line + i)
+          beginning_of_line
+          line_start = @point
+
+          # Move to start column, extending line if necessary
+          col = 0
+          while col < start_col && !end_of_line?
+            forward_char
+            col = display_width(substring(line_start, @point))
+          end
+
+          # If line is shorter than start_col, extend it with spaces
+          if col < start_col
+            insert(" " * (start_col - col))
+          end
+
+          # Insert the rectangle line
+          insert(line)
+        end
+      end
+    end
+
+    def open_rectangle(s = @point, e = mark)
+      check_read_only_flag
+      s, e = Buffer.region_boundaries(s, e)
+      composite_edit do
+        apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
+          # If line is shorter than start_col, extend it with spaces
+          if col < start_col
+            insert(" " * (start_col - col))
+          end
+
+          # Insert spaces to create the rectangle
+          insert(" " * (end_col - start_col))
+        end
+        goto_char(s)
+      end
+    end
+
+    def clear_rectangle(s = @point, e = mark)
+      check_read_only_flag
+      apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
+        start_pos = @point
+        if col < start_col
+          insert(" " * (end_col - start_col))
+        else
+          while col < end_col && !end_of_line?
+            forward_char
+            col = display_width(substring(line_start, @point))
+          end
+          end_pos = @point
+
+          delete_region(start_pos, end_pos) if end_pos > start_pos
+          insert(" " * (end_col - start_col))
+        end
+      end
+    end
+
+    def string_rectangle(str, s = @point, e = mark)
+      check_read_only_flag
+      apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
+        start_pos = @point
+        if col < start_col
+          insert(" " * (start_col - col))
+          insert(str)
+        else
+          while col < end_col && !end_of_line?
+            forward_char
+            col = display_width(substring(line_start, @point))
+          end
+          end_pos = @point
+
+          delete_region(start_pos, end_pos) if end_pos > start_pos
+          insert(str)
+        end
+      end
+    end
+
+    def string_insert_rectangle(str, s = @point, e = mark)
+      check_read_only_flag
+      apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
+        if col < start_col
+          insert(" " * (start_col - col))
+        end
+        insert(str)
+      end
+    end
+
+    def rectangle_number_lines(s = @point, e = mark)
+      check_read_only_flag
+      n = 1
+      number_width = nil
+      apply_on_rectangle(s, e) do |start_col, end_col, col, line_start, start_line, end_line|
+        number_width ||= (1 + (end_line - start_line)).to_s.size
+        if col < start_col
+          insert(" " * (start_col - col))
+        end
+        insert(n.to_s.rjust(number_width) + " ")
+        n += 1
+      end
+    end
+  end
+end
+
+using Textbringer::Buffer::RectangleMethods
+
+module Textbringer
+  module Commands
+    define_command(:kill_rectangle,
+                   doc: "Kill the text of the region-rectangle, saving its contents as the last killed rectangle.") do
+      Buffer.current.kill_rectangle
+    end
+
+    define_command(:copy_rectangle_as_kill,
+                   doc: "Save the text of the region-rectangle as the last killed rectangle.") do
+      Buffer.current.copy_rectangle
+    end
+
+    define_command(:delete_rectangle,
+                   doc: "Delete the text of the region-rectangle.") do
+      Buffer.current.delete_rectangle
+    end
+
+    define_command(:yank_rectangle,
+                   doc: "Yank the last killed rectangle with its upper left corner at point.") do
+      Buffer.current.yank_rectangle
+    end
+
+    define_command(:open_rectangle,
+                   doc: "Insert blank space to fill the space of the region-rectangle. This pushes the previous contents of the region-rectangle to the right.") do
+      Buffer.current.open_rectangle
+    end
+
+    define_command(:clear_rectangle,
+                   doc: "Clear the region-rectangle by replacing its contents with spaces.") do
+      Buffer.current.clear_rectangle
+    end
+
+    define_command(:string_rectangle,
+                   doc: "Replace rectangle contents with the specified string on each line.") do
+      |str = read_from_minibuffer("String rectangle: ")|
+      Buffer.current.string_rectangle(str)
+    end
+
+    define_command(:string_insert_rectangle,
+                   doc: "Insert the specified string on each line of the rectangle.") do
+      |str = read_from_minibuffer("String insert rectangle: ")|
+      Buffer.current.string_insert_rectangle(str)
+    end
+
+    define_command(:rectangle_number_lines,
+                   doc: "Insert numbers in front of the region-rectangle.") do
+      Buffer.current.rectangle_number_lines
+    end
+  end
+end

data/lib/textbringer/keymap.rb

@@ -208,6 +208,9 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-xrd", :delete_rectangle)
   GLOBAL_MAP.define_key("\C-xry", :yank_rectangle)
   GLOBAL_MAP.define_key("\C-xro", :open_rectangle)
+  GLOBAL_MAP.define_key("\C-xrc", :clear_rectangle)
+  GLOBAL_MAP.define_key("\C-xrt", :string_rectangle)
+  GLOBAL_MAP.define_key("\C-xrN", :rectangle_number_lines)
   GLOBAL_MAP.define_key("\C-x(", :start_keyboard_macro)
   GLOBAL_MAP.define_key(:f3, :start_keyboard_macro)
   GLOBAL_MAP.define_key("\C-x)", :end_keyboard_macro)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "12"
+  VERSION = "14"
 end

data/lib/textbringer/window.rb

@@ -405,7 +405,7 @@ module Textbringer
         @window.erase
         @window.setpos(0, 0)
         @window.attrset(0)
-        if current? && @buffer.visible_mark &&
+        if @buffer.visible_mark &&
            @buffer.point_after_mark?(@buffer.visible_mark)
           @window.attron(Curses::A_REVERSE)
         end
@@ -450,7 +450,7 @@ module Textbringer
           break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end
-        if current? && @buffer.visible_mark
+        if @buffer.visible_mark
           @window.attroff(Curses::A_REVERSE)
         end
         @buffer.mark_to_point(@bottom_of_window)
@@ -679,7 +679,7 @@ module Textbringer
       if @buffer.point_at_mark?(point)
         @cursor.y = cury
         @cursor.x = curx
-        if current? && @buffer.visible_mark
+        if @buffer.visible_mark
           if @buffer.point_after_mark?(@buffer.visible_mark)
             @window.attroff(Curses::A_REVERSE)
           elsif @buffer.point_before_mark?(@buffer.visible_mark)
@@ -687,7 +687,7 @@ module Textbringer
           end
         end
       end
-      if current? && @buffer.visible_mark &&
+      if @buffer.visible_mark &&
          @buffer.point_at_mark?(@buffer.visible_mark)
         if @buffer.point_after_mark?(point)
           @window.attroff(Curses::A_REVERSE)

data/lib/textbringer.rb

@@ -14,7 +14,9 @@ require_relative "textbringer/commands/windows"
 require_relative "textbringer/commands/files"
 require_relative "textbringer/commands/misc"
 require_relative "textbringer/commands/isearch"
+require_relative "textbringer/commands/ispell"
 require_relative "textbringer/commands/replace"
+require_relative "textbringer/commands/rectangle"
 require_relative "textbringer/commands/dabbrev"
 require_relative "textbringer/commands/ctags"
 require_relative "textbringer/commands/clipboard"

data/textbringer.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'textbringer/version'
+require_relative 'lib/textbringer/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "textbringer"
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/shugo/textbringer"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^((test|spec|features|logo)/|\.)}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '12'
+  version: '14'
 platform: ruby
 authors:
 - Shugo Maeda
@@ -328,14 +328,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitattributes"
-- ".github/dependabot.yml"
-- ".github/workflows/macos.yml"
-- ".github/workflows/push_gem.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
-- ".gitignore"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -360,8 +352,10 @@ files:
 - lib/textbringer/commands/help.rb
 - lib/textbringer/commands/input_method.rb
 - lib/textbringer/commands/isearch.rb
+- lib/textbringer/commands/ispell.rb
 - lib/textbringer/commands/keyboard_macro.rb
 - lib/textbringer/commands/misc.rb
+- lib/textbringer/commands/rectangle.rb
 - lib/textbringer/commands/register.rb
 - lib/textbringer/commands/replace.rb
 - lib/textbringer/commands/server.rb
@@ -397,8 +391,6 @@ files:
 - lib/textbringer/version.rb
 - lib/textbringer/window.rb
 - lib/textbringer/window/fallback_characters.rb
-- logo/logo.jpg
-- logo/logo.png
 - screenshot.png
 - textbringer.gemspec
 homepage: https://github.com/shugo/textbringer
@@ -419,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []

data/.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-
-[*.rb]
-indent_style = space
-indent_size = 2
-
-[lib/**.rb]
-trim_trailing_whitespace = true
-insert_final_newline = true

data/.gitattributes

@@ -1 +0,0 @@
-*.rb diff=ruby

data/.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: 'weekly'

data/.github/workflows/macos.yml

@@ -1,23 +0,0 @@
-name: macos
-
-on: [push]
-
-jobs:
-  test:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        ruby: [ head, 3.4 ]
-    timeout-minutes: 10
-    env:
-      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        bundle install
-    - name: Run test
-      run: bundle exec rake test

data/.github/workflows/push_gem.yml

@@ -1,54 +0,0 @@
-name: Publish gem to rubygems.org
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    if: github.repository == 'shugo/textbringer'
-    runs-on: ubuntu-latest
-
-    environment:
-      name: rubygems.org
-      url: https://rubygems.org/gems/textbringer
-
-    permissions:
-      contents: write
-      id-token: write
-
-    steps:
-      # Set up
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@v4
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-          ruby-version: ruby
-
-      # Release
-      - name: Publish to RubyGems
-        uses: rubygems/release-gem@v1
-
-      - name: Create GitHub release
-        run: |
-          tag_name="$(git describe --tags --abbrev=0)"
-          gh release create "${tag_name}" --verify-tag --generate-notes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Purge GitHub cache
-        shell: bash
-        run: |
-          urls=$(curl -sL "https://github.com/${{ github.repository_owner }}/${{ github.event.repository.name }}/tree/main" | grep -Eo "(http|https)://camo.githubusercontent.com[a-zA-Z0-9./?=_%:-]*")
-          while IFS= read -r url; do echo -e "\nPurge $url"; curl -X PURGE "$url"; done <<< "$urls"

data/.github/workflows/ubuntu.yml

@@ -1,24 +0,0 @@
-name: ubuntu
-
-on: [push]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ head, 3.4, 3.3, 3.2 ]
-    timeout-minutes: 10
-    env:
-      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        sudo apt install libncursesw5-dev
-        bundle install
-    - name: Run test
-      run: xvfb-run bundle exec rake test

data/.github/workflows/windows.yml

@@ -1,22 +0,0 @@
-name: windows
-
-on: [push]
-
-jobs:
-  test:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        ruby: [ '3.4' ]
-    timeout-minutes: 10
-    env:
-      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run test
-      run: bundle exec rake test

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/tags