textbringer 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cadae924b2e85758480d58a7f4ba6ff48fc6ac1971039159a8b81a1a0bbbd29
-  data.tar.gz: cb981c7fb394e1c4683cd1365f5da1ed1f372c4254d3e9d8ca5782cad18cf167
+  metadata.gz: 42dc4dbbf6e190e38d32657942af39c2bf5afec5035a6674d54a7d621c755086
+  data.tar.gz: dbaa67ad2fca2b24d661610e7467b94022da87928473a2a37a7169deda7a27ac
 SHA512:
-  metadata.gz: a57df2132fc40661649106e25f523e7f866ae469020fb33b687d1bf05921f0b4f17915271df4745035737b3be0c65d34650ae55af3ca10d4f677d7c2ac4d7715
-  data.tar.gz: fd5081ffaa6a8f42466fdc9fd82d6acd4a732941c66d5e2d37fd1c2a66cafba947de668a08ea60ac87f171306aadcaeca6e815991666bcac47ac376a8cd16d73
+  metadata.gz: c765b54dc47b490c8fe9d53b84b00734281a1d5e5e22714eaba7c9a69c71480271fb0b34a2883fed4f7ad4be1fc2933871e1c0fe5585e16e12b87f569a8ee662
+  data.tar.gz: '0684345317fcf495d5cf0f7951e120f88f24f025f8c14960dac33874c131f70f2c6a24e1ee6b8b8774783deea8b80c9047a063a8f0fe79666824578e5e54f5dc'

data/.github/workflows/ubuntu.yml

@@ -6,7 +6,7 @@ jobs:
   test:
     strategy:
       matrix:
-        ruby: [ head, 2.7, 2.6, 2.5, 2.4 ]
+        ruby: [ head, 3.0, 2.7, 2.6 ]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

data/.github/workflows/windows.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ 'mingw', 'mswin', '2.7', '2.6', '2.5' ]
+        ruby: [ 'mingw', 'mswin', '3.0', '2.7', '2.6' ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/CHANGES.md

@@ -1,3 +1,27 @@
+## 1.0.9
+
+* Remove mazegaki.dic and bushu.rev
+
+## 1.0.8
+
+* Updated mazegaki.dic
+* Add licenses of dictionary data to LEGAL.txt
+
+## 1.0.7
+
+* Support endless method definitions in ruby-mode.
+* Updated mazegaki.dic.
+
+## 1.0.6
+
+* Add the Hiragana input method.
+* Add make_directory.
+* Bug fixes.
+
+## 1.0.5
+
+* Support the Japanese input method T-Code.
+
 ## 1.0.4
 
 * Support Ruby 3.0.

data/bin/merge_mazegaki_dic

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+MAZEGAKI_DIC = Hash.new([])
+
+ARGF.each_line do |line|
+  next if /^\p{ascii}/.match?(line)
+  x, y = line.split
+  key = x.sub(/\A(\p{hiragana}+)[a-z>]\z/, "\\1—")
+  values = y.split("/").map { |i|
+    i.sub(/;.*/, "")
+  }.reject { |i|
+    i.empty? || i == key
+  }
+  MAZEGAKI_DIC[key] |= values
+end
+
+MAZEGAKI_DIC.sort_by { |key,|
+  key
+}.each do |key, values|
+  puts "#{key} /#{values.join('/')}/"
+end
+
+

data/exe/textbringer

@@ -5,8 +5,8 @@ require "textbringer"
 include Textbringer
 include Commands
 
-def load_user_config
-  config_file = File.expand_path("~/.textbringer.rb")
+def load_user_config(path)
+  config_file = File.expand_path(path)
   begin
     load(config_file)
   rescue LoadError
@@ -24,8 +24,9 @@ Controller.current = Controller.new
 begin
   Window.start do
     begin
+      load_user_config("~/.textbringer/init.rb")
       Plugin.load_plugins
-      load_user_config
+      load_user_config("~/.textbringer.rb")
       ruby_mode
       if ARGV.size > 0
         ARGV.each do |arg|

data/lib/textbringer.rb

@@ -22,6 +22,7 @@
 require_relative "textbringer/commands/keyboard_macro"
 require_relative "textbringer/commands/fill"
 require_relative "textbringer/commands/server"
+require_relative "textbringer/commands/input_method"
 require_relative "textbringer/commands/help"
 require_relative "textbringer/mode"
 require_relative "textbringer/modes/fundamental_mode"
@@ -32,5 +33,8 @@
 require_relative "textbringer/modes/completion_list_mode"
 require_relative "textbringer/modes/buffer_list_mode"
 require_relative "textbringer/modes/help_mode"
+require_relative "textbringer/input_method"
+require_relative "textbringer/input_methods/t_code_input_method"
+require_relative "textbringer/input_methods/hiragana_input_method"
 require_relative "textbringer/plugin"
 require_relative "textbringer/controller"

data/lib/textbringer/buffer.rb

@@ -11,6 +11,7 @@ class Buffer
     attr_accessor :mode, :keymap
     attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks
     attr_reader :current_line, :current_column, :visible_mark
+    attr_reader :input_method
 
     GAP_SIZE = 256
     UNDO_LIMIT = 1000
@@ -240,6 +241,7 @@ def initialize(s = +"", name: nil,
       @visible_mark = nil
       @read_only = read_only
       @callbacks = {}
+      @input_method = nil
     end
 
     def inspect
@@ -410,6 +412,7 @@ def save(file_name = @file_name)
           f.flock(File::LOCK_EX)
           write_to_file(f)
           f.flush
+          f.fsync
         end
         @file_mtime = File.mtime(file_name)
       rescue Errno::EISDIR
@@ -1384,6 +1387,35 @@ def insert_final_newline
       end
     end
 
+    def toggle_input_method(name)
+      if name.nil?
+        @input_method ||= InputMethod.find(CONFIG[:default_input_method])
+      else
+        @input_method = InputMethod.find(name)
+      end
+      @input_method.toggle
+    end
+
+    def disable_input_method
+      @input_method&.disable
+    end
+
+    def filter_event(event)
+      if @input_method
+        @input_method.filter_event(event)
+      else
+        event
+      end
+    end
+
+    def input_method_status
+      if @input_method&.enabled?
+        @input_method.status
+      else
+        "--"
+      end
+    end
+
     private
 
     def set_contents(s, enc)
@@ -1649,6 +1681,7 @@ class InsertAction < UndoableAction
     def initialize(buffer, location, string)
       super(buffer, location)
       @string = string
+      @copied = false
     end
 
     def undo
@@ -1662,6 +1695,10 @@ def redo
     end
 
     def merge(s)
+      unless @copied
+        @string = @string.dup
+        @copied = true
+      end
       @string.concat(s)
     end
   end

data/lib/textbringer/commands/files.rb

@@ -1,4 +1,5 @@
 require "editorconfig"
+require "fileutils"
 
 module Textbringer
   module Commands
@@ -131,5 +132,12 @@ module Commands
                                   default: Buffer.current.file_name)|
       find_file(file_name)
     end
+
+    define_command(:make_directory, doc: "Create a new directory.") do
+      |dir_name = read_file_name("Make directory: ",
+                                 default: Buffer.current.file_name &&
+                                 File.dirname(Buffer.current.file_name))|
+      FileUtils.mkdir_p(dir_name)
+    end
   end
 end

data/lib/textbringer/commands/input_method.rb

@@ -0,0 +1,18 @@
+module Textbringer
+  module Commands
+    define_command(:toggle_input_method,
+                   doc: "Toggel input method.") do |name = nil|
+      if name.nil? && current_prefix_arg
+        name = read_input_method_name("Input method: ")
+      end
+      Buffer.current.toggle_input_method(name)
+    end
+
+    def read_input_method_name(prompt, default: CONFIG[:default_input_method])
+      f = ->(s) {
+        complete_for_minibuffer(s.tr("-", "_"), InputMethod.list)
+      }
+      read_from_minibuffer(prompt, completion_proc: f, default: default)
+    end
+  end
+end

data/lib/textbringer/commands/isearch.rb

@@ -14,12 +14,14 @@ module Commands
     end
     ISEARCH_MODE_MAP.define_key(:backspace, :isearch_delete_char)
     ISEARCH_MODE_MAP.define_key(?\C-h, :isearch_delete_char)
+    ISEARCH_MODE_MAP.define_key(?\C-?, :isearch_delete_char)
     ISEARCH_MODE_MAP.define_key(?\C-s, :isearch_repeat_forward)
     ISEARCH_MODE_MAP.define_key(?\C-r, :isearch_repeat_backward)
     ISEARCH_MODE_MAP.define_key(?\C-w, :isearch_yank_word_or_char)
     ISEARCH_MODE_MAP.define_key(?\C-m, :isearch_exit)
     ISEARCH_MODE_MAP.define_key(?\C-g, :isearch_abort)
     ISEARCH_MODE_MAP.define_key(?\C-q, :isearch_quoted_insert)
+    ISEARCH_MODE_MAP.define_key(?\C-\\, :isearch_toggle_input_method)
 
     ISEARCH_STATUS = {
       forward: true,
@@ -56,6 +58,10 @@ def isearch_mode(forward, recursive_edit: false)
       end
     end
 
+    def isearch_mode?
+      Controller.current.overriding_map == ISEARCH_MODE_MAP
+    end
+
     def isearch_prompt
       if ISEARCH_STATUS[:forward]
         "I-search: "
@@ -133,7 +139,7 @@ def isearch_search
       re = Regexp.new(Regexp.quote(ISEARCH_STATUS[:string]), options)
       last_pos = ISEARCH_STATUS[:last_pos]
       offset = forward ? last_pos : last_pos - ISEARCH_STATUS[:string].bytesize
-      if Buffer.current.byteindex(forward, re, offset)
+      if offset >= 0 && Buffer.current.byteindex(forward, re, offset)
         if Buffer.current != Buffer.minibuffer
           message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
         end
@@ -164,5 +170,11 @@ def isearch_repeat(forward)
       end
       isearch_search
     end
+
+    define_command(:isearch_toggle_input_method,
+                   doc: "Toggle input method.") do
+      toggle_input_method
+      message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
+    end
   end
 end

data/lib/textbringer/commands/windows.rb

@@ -69,9 +69,13 @@ module Commands
     define_command(:switch_to_buffer, doc: <<~EOD) do
         Display buffer in the current window.
       EOD
-      |buffer = read_buffer("Switch to buffer: ")|
+      |buffer = read_buffer("Switch to buffer: "), arg = current_prefix_arg|
       if buffer.is_a?(String)
-        buffer = Buffer[buffer]
+        if arg
+          buffer = Buffer.find_or_new(buffer)
+        else
+          buffer = Buffer[buffer]
+        end
       end
       if buffer
         Window.current.buffer = Buffer.current = buffer

data/lib/textbringer/config.rb

@@ -15,6 +15,7 @@ module Textbringer
     shell_file_name: ENV["SHELL"],
     shell_command_switch: "-c",
     grep_command: "grep -nH -e",
-    fill_column: 70
+    fill_column: 70,
+    default_input_method: "t_code"
   }
 end

data/lib/textbringer/controller.rb

@@ -264,7 +264,13 @@ def read_event_with_keyboard_macro(read_event_method)
     end
 
     def call_read_event_method(read_event_method)
-      Window.current.send(read_event_method)
+      Window.current.send(read_event_method)&.then { |event|
+        if @key_sequence.empty?
+          Buffer.current.filter_event(event)
+        else
+          event
+        end
+      }
     end
   end
 end

data/lib/textbringer/input_method.rb

@@ -0,0 +1,63 @@
+module Textbringer
+  class InputMethod
+    extend Commands
+    include Commands
+
+    @@list = []
+
+    def self.inherited(subclass)
+      name = subclass.name.sub(/Textbringer::/, "").sub(/InputMethod/, "").
+        gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').
+        downcase
+      @@list.push(name)
+    end
+
+    def self.list
+      @@list
+    end
+
+    def self.find(name)
+      class_name = name.split(/_/).map(&:capitalize).join + "InputMethod"
+      Textbringer.const_get(class_name).new
+    rescue NameError
+      raise EditorError, "No such input method: #{name}"
+    end
+
+    def initialize
+      @enabled = false
+      @skip_next_event = false
+    end
+
+    def toggle
+      @enabled = !@enabled
+    end
+
+    def disable
+      @enabled = false
+    end
+
+    def enabled?
+      @enabled
+    end
+
+    def filter_event(event)
+      if @enabled
+        if event == "\e"
+          @skip_next_event = true
+          event
+        elsif @skip_next_event
+          @skip_next_event = false
+          event
+        else
+          handle_event(event)
+        end
+      else
+        event
+      end
+    end
+
+    def handle_event(event)
+      raise EditorError, "subclass must override InputMethod#handle_event"
+    end
+  end
+end

data/lib/textbringer/input_methods/hiragana_input_method.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Textbringer
+  class HiraganaInputMethod < InputMethod
+    HIRAGANA_TABLE = {
+      "a" => "あ", "i" => "い", "u" => "う", "e" => "え", "o" => "お",
+      "ka" => "か", "ki" => "き", "ku" => "く", "ke" => "け", "ko" => "こ",
+      "ga" => "が", "gi" => "ぎ", "gu" => "ぐ", "ge" => "げ", "go" => "ご",
+      "sa" => "さ", "si" => "し", "su" => "す", "se" => "せ", "so" => "そ",
+      "za" => "ざ", "zi" => "じ", "zu" => "ず", "ze" => "ぜ", "zo" => "ぞ",
+      "sha" => "しゃ", "shi" => "し", "shu" => "しゅ", "she" => "しぇ", "sho" => "しょ",
+      "ja" => "じゃ", "ji" => "じ", "ju" => "じゅ", "je" => "じぇ", "jo" => "じょ",
+      "ta" => "た", "ti" => "ち", "tu" => "つ", "te" => "て", "to" => "と",
+      "da" => "だ", "di" => "ぢ", "du" => "づ", "de" => "で", "do" => "ど",
+      "cha" => "ちゃ", "chi" => "ち", "chu" => "ちゅ", "che" => "ちぇ", "cho" => "ちょ",
+      "na" => "な", "ni" => "に", "nu" => "ぬ", "ne" => "ね", "no" => "の",
+      "ha" => "は", "hi" => "ひ", "hu" => "ふ", "he" => "へ", "ho" => "ほ",
+      "ba" => "ば", "bi" => "び", "bu" => "ぶ", "be" => "べ", "bo" => "ぼ",
+      "pa" => "ぱ", "pi" => "ぴ", "pu" => "ぷ", "pe" => "ぺ", "po" => "ぽ",
+      "ma" => "ま", "mi" => "み", "mu" => "む", "me" => "め", "mo" => "も",
+      "ya" => "や", "yi" => "い", "yu" => "ゆ", "ye" => "いぇ", "yo" => "よ",
+      "ra" => "ら", "ri" => "り", "ru" => "る", "re" => "れ", "ro" => "ろ",
+      "wa" => "わ", "wi" => "ゐ", "wu" => "う", "we" => "ゑ", "wo" => "を",
+      "nn" => "ん"
+    }
+    HIRAGANA_PREFIXES = HIRAGANA_TABLE.keys.flat_map { |s|
+      (s.size - 1).times.map { |i| s[0, i + 1] }
+    }.uniq
+
+    def initialize
+      super
+      @input_buffer = +""
+    end
+
+    def status
+      "あ"
+    end
+
+    def handle_event(event)
+      if !event.is_a?(String)
+        if !@input_buffer.empty?
+          @input_buffer = +""
+        end
+        return event
+      end
+      @input_buffer << event
+      s = HIRAGANA_TABLE[@input_buffer]
+      if s
+        return flush(s)
+      end
+      if HIRAGANA_PREFIXES.include?(@input_buffer)
+        return nil
+      end
+      flush(@input_buffer)
+    end
+
+    def flush(s)
+      if !@input_buffer.empty?
+        @input_buffer = +""
+      end
+      if s.size == 1
+        s
+      else
+        Buffer.current.insert(s)
+        Window.redisplay
+        nil
+      end
+    end
+  end
+end

data/lib/textbringer/input_methods/t_code_input_method.rb

@@ -0,0 +1,458 @@
+module Textbringer
+  class TCodeInputMethod < InputMethod
+    require_relative "t_code_input_method/tables"
+
+    data_dir = File.expand_path("t_code_input_method", __dir__)
+    BUSHU_PATH = File.expand_path("bushu.rev", data_dir)
+    BUSHU_DIC = {} unless defined?(BUSHU_DIC)
+    MAZEGAKI_PATH = File.expand_path("mazegaki.dic", data_dir)
+    MAZEGAKI_DIC = {} unless defined?(MAZEGAKI_DIC)
+    MAZEGAKI_MAX_WORD_LEN = 12 # じょうほうしょりがっかい
+    MAZEGAKI_MAX_SUFFIX_LEN = 4
+
+    def initialize
+      super
+      @prev_key_index = nil
+      @mazegaki_start_pos = nil
+      @mazegaki_candidates = nil
+      @delete_help_window = false
+      @help_window = nil
+      @prev_buffer = nil
+      setup_dictionaries
+    end
+
+    def setup_dictionaries
+      data_dir = CONFIG[:t_code_data_dir] ||
+        File.expand_path("~/.textbringer/tcode")
+      bushu_path = File.join(data_dir, "bushu.rev")
+      mazegaki_path = File.join(data_dir, "mazegaki.dic")
+      if BUSHU_DIC.empty?
+        File.open(bushu_path) do |f|
+          f.each_line do |line|
+            x, *xs = line.chomp.chars
+            BUSHU_DIC[xs.sort.join] = x
+          end
+        end
+      end
+      if MAZEGAKI_DIC.empty?
+        File.open(mazegaki_path) do |f|
+          f.each_line do |line|
+            x, y = line.split
+            MAZEGAKI_DIC[x] = y
+          end
+        end
+      end
+    end
+
+    def status
+      "漢"
+    end
+
+    def handle_event(event)
+      key_index = KEY_TABLE[event]
+      if @mazegaki_start_pos
+        if process_mazegaki_conversion(event, key_index)
+          return nil
+        end
+      end
+      if key_index.nil?
+        @prev_key_index = nil
+        return event
+      end
+      if @prev_key_index.nil?
+        @prev_key_index = key_index
+        nil
+      else
+        c = KANJI_TABLE[key_index][@prev_key_index]
+        @prev_key_index = nil
+        case c
+        when ?■
+          nil
+        when ?◆
+          bushu_compose
+        when ?◇
+          start_mazegaki_conversion(false)
+        when ?◈
+          start_mazegaki_conversion(true)
+        when ?⑤
+          show_stroke
+        else
+          c
+        end
+      end
+    end
+
+    def with_target_buffer(&block)
+      if isearch_mode?
+        @isearch_buffer ||= Buffer.new
+        if @isearch_buffer.to_s != ISEARCH_STATUS[:string]
+          @isearch_buffer.replace(ISEARCH_STATUS[:string])
+        end
+        block.call(@isearch_buffer)
+        ISEARCH_STATUS[:string] = @isearch_buffer.to_s
+        if Buffer.current != Buffer.minibuffer
+          message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
+          Window.redisplay
+        end
+      else
+        block.call(Buffer.current)
+      end
+    end
+
+    def bushu_compose
+      with_target_buffer do |buffer|
+        pos = buffer.point
+        s = 2.times.map {
+          buffer.backward_char
+          buffer.char_after
+        }.sort.join
+        c = BUSHU_DIC[s]
+        if c
+          buffer.replace(c, start: buffer.point, end: pos)
+        else
+          buffer.goto_char(pos)
+        end
+      end
+      isearch_search if isearch_mode?
+      Window.redisplay
+      nil
+    end
+
+    def start_mazegaki_conversion(with_inflection = false)
+      @mazegaki_convert_with_inflection = with_inflection
+      pos, yomi = find_mazegaki_start_pos(with_inflection)
+      if pos.nil?
+        raise EditorError, "No mazegaki conversion candidate"
+      end
+      mazegaki_convert(pos, yomi)
+    end
+
+    def mazegaki_convert(pos, yomi)
+      with_target_buffer do |buffer|
+        candidates = mazegaki_lookup_candidates(yomi)
+        if candidates
+          @mazegaki_yomi = yomi
+          @mazegaki_suffix = buffer.substring(pos + yomi.bytesize,
+                                              buffer.point)
+          case candidates.size
+          when 1
+            buffer.composite_edit do
+              buffer.delete_region(pos, buffer.point)
+              buffer.insert("△" + candidates[0] + @mazegaki_suffix)
+            end
+          when 2
+            buffer.composite_edit do
+              buffer.delete_region(pos, buffer.point)
+              buffer.insert("△{" + candidates.join(",") + "}" +
+                            @mazegaki_suffix)
+            end
+          else
+            buffer.save_excursion do
+              buffer.goto_char(pos)
+              buffer.insert("△")
+            end
+          end
+          @mazegaki_start_pos = pos
+          @mazegaki_candidates = candidates
+          @mazegaki_candidates_page = 0
+          if candidates.size > 2
+            show_mazegaki_candidates
+          end
+        end
+        Window.redisplay
+        nil
+      end
+    end
+
+    def mazegaki_lookup_yomi(s, with_inflectin)
+      if !with_inflectin
+        return MAZEGAKI_DIC.key?(s) ? s : nil
+      end
+      yomi = s.sub(/\p{hiragana}\z/, "")
+      (MAZEGAKI_MAX_SUFFIX_LEN + 1).times do
+        return yomi if MAZEGAKI_DIC.key?(yomi + "—")
+        break if !yomi.sub!(/\p{hiragana}\z/, "")
+      end
+      nil
+    end
+
+    def mazegaki_lookup_candidates(yomi)
+      if @mazegaki_convert_with_inflection
+        s = yomi + "—"
+      else
+        s = yomi
+      end
+      c = MAZEGAKI_DIC[s]
+      return nil if c.nil?
+      candidates = c.split("/").map { |i|
+        i.sub(/;.*/, "")
+      }.reject(&:empty?)
+      return nil if candidates.empty?
+      candidates
+    end
+
+    def find_mazegaki_start_pos(with_inflection)
+      with_target_buffer do |buffer|
+        buffer.save_excursion do
+          pos = buffer.point
+          start_pos = nil
+          yomi = nil
+          MAZEGAKI_MAX_WORD_LEN.times do
+            break if buffer.beginning_of_buffer?
+            buffer.backward_char
+            s = buffer.substring(buffer.point, pos)
+            y = mazegaki_lookup_yomi(s, with_inflection)
+            if y
+              start_pos = buffer.point
+              yomi = y
+            end
+          end
+          return start_pos, yomi
+        end
+      end
+    end
+
+    def process_mazegaki_conversion(event, key_index)
+      case event
+      when " "
+        mazegaki_next_page
+        return true
+      when "<"
+        mazegaki_relimit_left
+        return true
+      when ">"
+        mazegaki_relimit_right
+        return true
+      end
+      begin
+        if @mazegaki_candidates.size == 1
+          if event == "\C-m"
+            mazegaki_finish(@mazegaki_candidates[0])
+            return true
+          elsif key_index
+            mazegaki_finish(@mazegaki_candidates[0])
+            return false
+          end
+        elsif key_index
+          mazegaki_limit = MAZEGAKI_STROKE_PRIORITY_LIST.size
+          i = MAZEGAKI_STROKE_PRIORITY_LIST.index(key_index)
+          if i
+            offset = @mazegaki_candidates_page * mazegaki_limit + i
+            c = @mazegaki_candidates[offset]
+            if c
+              mazegaki_finish(c)
+              return true
+            end
+          end
+        end
+        mazegaki_reset
+        true
+      ensure
+        @mazegaki_start_pos = nil
+        @mazegaki_candidates = nil
+        Window.redisplay
+      end
+    end
+
+    def mazegaki_reset
+      with_target_buffer do |buffer|
+        buffer.undo
+        pos = @mazegaki_start_pos +
+          @mazegaki_yomi.bytesize + @mazegaki_suffix.bytesize
+        buffer.goto_char(pos)
+        hide_help_window
+      end
+    end
+
+    def mazegaki_finish(s)
+      mazegaki_reset
+      with_target_buffer do |buffer|
+        buffer.composite_edit do
+          buffer.delete_region(@mazegaki_start_pos, buffer.point)
+          buffer.insert(s + @mazegaki_suffix)
+        end
+      end
+      isearch_search if isearch_mode?
+    end
+
+    def hide_help_window
+      if @delete_help_window
+        Window.delete_window(@help_window)
+      elsif @prev_buffer
+        @help_window.buffer = @prev_buffer
+      end
+      @delete_help_window = false
+      @help_window = nil
+      @prev_buffer = nil
+    end
+
+    def mazegaki_next_page
+      if @mazegaki_candidates.size <= mazegaki_limit
+        return
+      end
+      @mazegaki_candidates_page += 1
+      if @mazegaki_candidates_page * mazegaki_limit >
+          @mazegaki_candidates.size
+        @mazegaki_candidates_page = 0
+      end
+      show_mazegaki_candidates
+      Window.redisplay
+    end
+
+    def mazegaki_relimit_left
+      with_target_buffer do |buffer|
+        yomi = nil
+        start_pos = nil
+        mazegaki_reset
+        buffer.save_excursion do
+          pos = buffer.point
+          buffer.goto_char(@mazegaki_start_pos)
+          s = buffer.substring(buffer.point, pos)
+          (MAZEGAKI_MAX_WORD_LEN - s.size).times do
+            break if buffer.beginning_of_buffer?
+            buffer.backward_char
+            s = buffer.substring(buffer.point, pos)
+            yomi = mazegaki_lookup_yomi(s, @mazegaki_convert_with_inflection)
+            if yomi
+              start_pos = buffer.point
+              break
+            end
+          end
+          if start_pos.nil?
+            message("Can't relimit left")
+            start_pos = @mazegaki_start_pos
+            yomi = @mazegaki_yomi
+          end
+        end
+        mazegaki_convert(start_pos, yomi)
+        Window.redisplay
+      end
+    end
+
+    def mazegaki_relimit_right
+      with_target_buffer do |buffer|
+        start_pos = nil
+        yomi = nil
+        mazegaki_reset
+        buffer.save_excursion do
+          pos = buffer.point
+          buffer.goto_char(@mazegaki_start_pos)
+          if @mazegaki_convert_with_inflection && @mazegaki_yomi &&
+              (yomi = mazegaki_lookup_yomi(@mazegaki_yomi, true))
+            start_pos = @mazegaki_start_pos
+          else
+            loop do
+              break if buffer.point >= pos
+              buffer.forward_char
+              s = buffer.substring(buffer.point, pos)
+              yomi = mazegaki_lookup_yomi(s, @mazegaki_convert_with_inflection)
+              if yomi
+                start_pos = buffer.point
+                break
+              end
+            end
+          end
+        end
+        if start_pos.nil?
+          if !@mazegaki_convert_with_inflection
+            start_pos, yomi = find_mazegaki_start_pos(true)
+            if start_pos
+              @mazegaki_convert_with_inflection = true
+            end
+          end
+          if start_pos.nil?
+            message("Can't relimit right")
+            start_pos = @mazegaki_start_pos
+            yomi = @mazegaki_yomi
+          end
+        end
+        mazegaki_convert(start_pos, yomi)
+        Window.redisplay
+      end
+    end
+
+    def show_mazegaki_candidates
+      offset = @mazegaki_candidates_page * mazegaki_limit
+      candidates = @mazegaki_candidates[offset, mazegaki_limit]
+      xs = Array.new(40, "-")
+      candidates.each_with_index do |s, i|
+        xs[MAZEGAKI_STROKE_PRIORITY_LIST[i]] = s
+      end
+      max_width = candidates.map { |s|
+        Buffer.display_width(s)
+      }.max
+      page = @mazegaki_candidates_page + 1
+      page_count =
+        (@mazegaki_candidates.size.to_f / mazegaki_limit).ceil
+      message = xs.map.with_index { |s, i|
+        space = " " * (max_width - Buffer.display_width(s))
+        if i % 10 < 5
+          s + space
+        else
+          space + s
+        end
+      }.each_slice(10).map.with_index { |ys, i|
+        if i == 0
+          " " + ys[0, 4].join(" ") + "  " + ys[4, 2].join("  ") + "  " +
+            ys[6, 4].join(" ")
+        else
+          "[" + ys[0, 4].join(" ") + "] " + ys[4, 2].join("  ") + " [" +
+            ys[6, 4].join(" ") + "]"
+        end
+      }.join("\n") + "   (#{page}/#{page_count})"
+      show_help(message)
+    end
+
+    def mazegaki_limit
+      MAZEGAKI_STROKE_PRIORITY_LIST.size
+    end
+
+    def show_stroke
+      c = Buffer.current.char_after
+      x, y = KANJI_TABLE.find.with_index { |row, i|
+        j = row.index(c)
+        if j
+          break [j, i]
+        else
+          false
+        end
+      }
+      if x.nil?
+        raise EditorError, "Stroke not found"
+      end
+      s = "　" * 10 + "・・・・　　・・・・" * 3
+      s[x] = "１"
+      s[y] = "２"
+      message = s.gsub(/.{10}/, "\\&\n").gsub(/　/, "  ")
+      show_help(message)
+      Window.redisplay
+      nil
+    end
+
+    def show_help(message)
+      buffer = Buffer.find_or_new("*T-Code Help*",
+                                  undo_limit: 0, read_only: true)
+      buffer.read_only_edit do
+        buffer.clear
+        buffer.insert(message)
+        buffer.beginning_of_buffer
+      end
+      if Window.list.size == 1
+        Window.list.first.split(message.lines.size + 1)
+        @delete_help_window = true
+      end
+      if Window.current.echo_area?
+        window = Window.list.last
+      else
+        windows = Window.list
+        i = (windows.index(Window.current) + 1) % windows.size
+        window = windows[i]
+      end
+      @help_window = window
+      if window.buffer != buffer
+        @prev_buffer = window.buffer
+        window.buffer = buffer
+      end
+    end
+  end
+end

data/lib/textbringer/input_methods/t_code_input_method/tables.rb

@@ -0,0 +1,64 @@
+module Textbringer
+  class TCodeInputMethod
+    KEYBOARD = "1234567890" "qwertyuiop" "asdfghjkl;" "zxcvbnm,./"
+
+    KEY_TABLE = KEYBOARD.each_char.with_index.map { |c, i|
+      [c, i]
+    }.to_h
+
+    KANJI_TABLE = [
+      "■■■■■■■■■■ヮヰヱヵヶ請境系探象ゎゐゑ■■盛革突温捕■■■■■依繊借須訳",
+      "■■■■■■■■■■丑臼宴縁曳尚賀岸責漁於汚乙穏■益援周域荒■■■■■織父枚乱香",
+      "■■■■■■■■■■鬼虚狭脅驚舎喜幹丘糖奇既菊却享康徒景処ぜ■■■■■譲ヘ模降走",
+      "■■■■■■■■■■孤誇黄后耕布苦圧恵固巧克懇困昏邦舞雑漢緊■■■■■激干彦均又",
+      "■■■■⑤■■■■■奉某貌卜■姿絶密秘押■■■■■衆節杉肉除■■■■■測血散笑弁",
+      "■■■■■■■■■■湖礼著移郷■■■■■償欧努底亜■■■■■禁硝樹句礎■■■■■",
+      "■■■■■■■■■■端飾郵塩群■星析遷宣紅傷豪維脱鼠曹奏尊■絹被源願臨■■■■■",
+      "■■■■◈■■■■■刷寿順危砂庶粧丈称蒸舗充喫腕暴■■■■■批慶渉竜併■■■■■",
+      "■■■■■■■■■■震扱片札乞■乃如尼帳輪倒操柄魚■■■■■就駐揮丹鮮■■■■■",
+      "■■■■■■■■■■弘痛票訴遺欄龍略慮累則存倍牛釈■■■■■綱潟創背皮■■■■■",
+      "ヲ哀暇啓把酸昼炭稲湯果告策首農歩回務島開報紙館夜位給員ど代レ欠夏彼妻善相家的対歴",
+      "ゥ逢牙掲伐貿捜異隣旧概買詳由死キせ区百木音王放々応分よル千ア財針裏居差付プばュ作",
+      "ヴ宛壊携避攻焼闘奈夕武残両在!や出タ手保案曲情引職7か(トれ従骨厚顔量内工八テ見",
+      "ヂ囲較劇卑盤帯易速拡風階能論増コ山者発立横興刺側覚きっ日国二適類御宇推九名川機チ",
+      "ヅ庵寒賢藩汽換延雪互細古利ペゃナ金マ和女崎白ぐ官球上く8え年母奥因酒伸サ建パ第入",
+      "簡徴触宗植■索射濁慢害賃整軽評佐法数郎談服声任検豊美題井洋実爆仲茶率比昔短岩巨敗",
+      "承章候途複■冊需詑迷撃折追隊角接備最急験変審改昇芸宿制集安画陽構旅施曜遠ォ将ぞ塚",
+      "快否歯筆里■皿輯蓄戻浴秀糸春幸記朝知ワ送限研労統役セ運ツ特谷ァ導認健尾序振練念働",
+      "包納頼逃寝■賛瞬貯羊積程断低減モ資士費ィ逆企精ざ印神び打勤ャ殺負何履般耳授版効視",
+      "唱暮憲勉罪■■盾虫■故鉱提児敷無石屋解募令違装然確優公品語演券悪秋非便示即難普辺",
+      "ぱ慰我兼菱桜瀬鳥催障収際太園船中スもお定種岡結進真3と〇てるヒ江別考権ッ人三京ち",
+      "ぴ為掛嫌紐典博筋忠乳若雄査ふ賞わラ東生ろ宅熟待取科ーした一が及久蔵早造ロク万方フ",
+      "ぷ陰敢顕描採謡希仏察指氏丸続ェう4)十リ料土活ね参い、の51投義算半県んまンつ四",
+      "ぺ隠甘牽憤君純副盟標ぎ格次習火あこ6学月受予切育池。◆0・2込沢軍青清けイす電地",
+      "ぽ胃患厳弊犯余堀肩療思術広門聞本さら高シ英ボ加室少ではになを転空性使級業時「長み",
+      "朱遅甲致汎■衰滋沈己病終起路越む南原駅物勢必講愛管要設水藤有素兵専親寮ホ共ブ平楽",
+      "陣鶴鹿貨絡■趨湿添已常張薬防得ケ式戦関男輸形助◇流連鉄教力ベ毛永申袋良私ゴ来信午",
+      "眼繁誌招季■垂甚徹巳寺質づ港条話座線ダ橋基好味宝争デ現エ他度等浅頃落命村ガ製校ご",
+      "執紹夢卸阿■粋■爪巴停領容玉右べ民ソ点遇足草築観言車成天世文板客師税飛ノ完重約各",
+      "岳刑弱雲窓■寸瞳陶■河置供試席期ゾ歳強係婦段衛額渋主映書可へ伝庭課着坂近外米ョ光",
+      "ぁ■瓦■■呼幅歓功盗徳渡守登退店持町所ほ件友卒初慣行ド円小ジヨ誤証含%海道ず西げ",
+      "ぃ■■■■紀破郡抗幡械刊訪融雨全じ自議明宮伊求技写通カ社野同判規感値ギ当理メウグ",
+      "ぅ■■■■房績識属衣帝始了極熱バ部六経動局頭配黒院だり—め大済吉ゆ器照不合面政オ",
+      "ぇ■■■■去疑ぢ綿離読鈴恐督況後間場ニ産向府富直倉新」9子五説週号葉派委化ビ目市",
+      "ぉ■■■■秒範核影麻族丁未才返問ム七住北割ぶ番望元事田会前そ休省央福毎気売下都株",
+      "欲巣茂述朗■■■■■帰庁昨跡ゲ洗羽個医静億録赤想消支協用表正図挙険ゼ波ヤ心界意今",
+      "迫災恋脳老■■■■■監寄裁達芝響忘討史環色貸販編仕先多商ハ交之末ぼ街免再ネ〜口台",
+      "留列刻豆看■■■■■竹注介具失司迎華許補左態花栄ザ調混ポ決ミ州払乗庫状団計夫食総",
+      "替沼?辞献■■■■■ゅ修究答養復並浦ユ冷ぬ展警型誰組選党択体例満津準遊戸ひょ価与",
+      "還更占箱矢■■■■■志抜航層深担陸巻競護根様独止堂銀以ヌ営治字材過諸単身ピ勝反ズ"
+    ]
+
+    # Key positions
+    #  0  1  2  3  4    5  6  7  8  9
+    # 10 11 12 13 14   15 16 17 18 19
+    # 20 21 22 23 24   25 26 27 28 29
+    # 30 31 32 33 34   35 36 37 38 39
+    MAZEGAKI_STROKE_PRIORITY_LIST = [
+      22, 23, 21, 24, 20,
+      12, 13, 11, 14, 10,
+      27, 26, 28, 25, 29,
+      17, 16, 18, 15, 19
+    ]
+  end
+end

data/lib/textbringer/keymap.rb

@@ -211,6 +211,7 @@ def kbd(key)
   GLOBAL_MAP.define_key([:f1, "f"], :describe_command)
   GLOBAL_MAP.define_key([:f1, "k"], :describe_key)
   GLOBAL_MAP.define_key("\C-x#", :server_edit_done)
+  GLOBAL_MAP.define_key("\C-\\", :toggle_input_method)
   GLOBAL_MAP.handle_undefined_key do |key|
     if key.is_a?(String) && /[\0-\x7f]/ !~ key
       :self_insert

data/lib/textbringer/modes/ruby_mode.rb

@@ -21,7 +21,7 @@ class | module | def | undef | begin | rescue | ensure | end |
         if | unless | then | elsif | else | case | when | while | until |
         for | break | next | redo | retry | in | do | return | yield |
         super | self | nil | true | false | and | or | not | alias
-      ) \b | defined\? )
+      ) \b (?![!?]) | defined\? )
     /x
 
     define_syntax :string, /
@@ -273,6 +273,7 @@ def calculate_indentation
         }
         if start_with_period ||
             (last_event == :on_op && last_text != "|") ||
+            (last_event == :on_kw && /\A(and|or)\z/.match?(last_text)) ||
             last_event == :on_period ||
             (last_event == :on_comma && event != :on_lbrace &&
              event != :on_lparen && event != :on_lbracket)
@@ -300,10 +301,12 @@ def find_nearest_beginning_token(tokens)
           case text
           when "class", "module", "def", "if", "unless", "case",
             "do", "for", "while", "until", "begin"
-            if /\A(if|unless|while|until)\z/.match?(text)
-              ts = tokens[0...i].reverse_each.take_while { |(l,_),| l == line }
-              t = ts.find { |_, e| e != :on_sp }
-              next if t && !(t[1] == :on_op && t[2] == "=")
+            if /\A(if|unless|while|until)\z/.match?(text) &&
+                modifier?(tokens, i)
+              next
+            end
+            if text == "def" && endless_method_def?(tokens, i)
+              next
             end
             if stack.empty?
               return i
@@ -330,6 +333,39 @@ def find_nearest_beginning_token(tokens)
       return nil, stack.grep_v(/[)\]]/).size
     end
 
+    def modifier?(tokens, i)
+      (line,), = tokens[i]
+      ts = tokens[0...i].reverse_each.take_while { |(l,_),| l == line }
+      t = ts.find { |_, e| e != :on_sp }
+      t && !(t[1] == :on_op && t[2] == "=")
+    end
+
+    def endless_method_def?(tokens, i)
+      ts = tokens.drop(i + 1)
+      ts.shift while ts[0][1] == :on_sp
+      _, event = ts.shift
+      return false if event != :on_ident
+      ts.shift while ts[0][1] == :on_sp
+      if ts[0][1] == :on_lparen
+        ts.shift
+        count = 1
+        while count > 0
+          _, event = ts.shift
+          return false if event.nil?
+          case event
+          when :on_lparen
+            count +=1
+          when :on_rparen
+            count -=1
+          end
+        end
+        ts.shift while ts[0][1] == :on_sp
+      end
+      ts[0][1] == :on_op && ts[0][2] == "="
+    rescue NoMethodError # no token
+      return false
+    end
+
     def find_test_target_path(base, namespace, name)
       patterns = []
       if namespace

data/lib/textbringer/utils.rb

@@ -179,6 +179,7 @@ def read_from_minibuffer(prompt, completion_proc: nil, default: nil,
         Window.current.buffer = Buffer.current = old_buffer
         Buffer.minibuffer[:completion_proc] = old_completion_proc
         Buffer.minibuffer.keymap = old_minibuffer_map
+        Buffer.minibuffer.disable_input_method
         Controller.current.current_prefix_arg = old_current_prefix_arg
         if COMPLETION[:original_buffer]
           COMPLETION[:completions_window].buffer = COMPLETION[:original_buffer]
@@ -199,8 +200,9 @@ def read_file_name(prompt, default: nil)
           end
         }
       }
+      initial_value = default&.sub(%r"\A#{Regexp.quote(Dir.pwd)}/", "")
       file = read_from_minibuffer(prompt, completion_proc: f,
-                                  initial_value: default)
+                                  initial_value: initial_value)
       File.expand_path(file)
     end
 

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "1.0.4"
+  VERSION = "1.0.9"
 end

data/lib/textbringer/window.rb

@@ -43,24 +43,27 @@ def self.current=(window)
       Buffer.current = window.buffer
     end
 
-    def self.delete_window
-      if @@current.echo_area?
+    def self.delete_window(target = @@current)
+      if target.echo_area?
         raise EditorError, "Can't delete the echo area"
       end
       if @@list.size == 2
         raise EditorError, "Can't delete the sole window"
       end
-      i = @@list.index(@@current)
+      i = @@list.index(target)
+      return if i.nil?
       if i == 0
         window = @@list[1]
         window.move(0, 0)
       else
         window = @@list[i - 1]
       end
-      window.resize(@@current.lines + window.lines, window.columns)
-      @@current.delete
+      window.resize(target.lines + window.lines, window.columns)
+      target.delete
       @@list.delete_at(i)
-      self.current = window
+      if target == @@current
+        self.current = window
+      end
     end
 
     def self.delete_other_windows
@@ -455,8 +458,9 @@ def redisplay
               end
             end
           end
-          if c == "\uFEFF"
-            # ncurses on macOS prints U+FEFF as space, so ignore it
+          if Buffer.display_width(c) == 0
+            # ncurses on macOS prints U+FEFF, U+FE0F etc. as space,
+            # so ignore it
           else
             @window.addstr(c)
           end
@@ -542,9 +546,16 @@ def scroll_down
       @top_of_window.location = 0
     end
 
-    def split
+    def split(other_lines = nil)
       old_lines = lines
-      new_lines = (old_lines / 2.0).ceil
+      if other_lines
+        if other_lines < CONFIG[:window_min_height]
+          raise EditorError, "Window too small"
+        end
+        new_lines = lines - other_lines
+      else
+        new_lines = (old_lines / 2.0).ceil
+      end
       if new_lines < CONFIG[:window_min_height]
         raise EditorError, "Window too small"
       end
@@ -649,7 +660,7 @@ def redisplay_mode_line
       @mode_line.setpos(0, 0)
       attrs = @@has_colors ? Face[:mode_line].attributes : Curses::A_REVERSE
       @mode_line.attrset(attrs)
-      @mode_line.addstr("#{@buffer.name} ")
+      @mode_line.addstr("#{@buffer.input_method_status} #{@buffer.name} ")
       @mode_line.addstr("[+]") if @buffer.modified?
       @mode_line.addstr("[RO]") if @buffer.read_only?
       @mode_line.addstr("[#{@buffer.file_encoding.name}/")

data/textbringer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_runtime_dependency "curses", ">= 1.2.7"
   spec.add_runtime_dependency "unicode-display_width", "~> 1.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -187,6 +187,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/merge_mazegaki_dic
 - exe/tbclient
 - exe/tbtags
 - exe/textbringer
@@ -201,6 +202,7 @@ files:
 - lib/textbringer/commands/files.rb
 - lib/textbringer/commands/fill.rb
 - lib/textbringer/commands/help.rb
+- lib/textbringer/commands/input_method.rb
 - lib/textbringer/commands/isearch.rb
 - lib/textbringer/commands/keyboard_macro.rb
 - lib/textbringer/commands/misc.rb
@@ -214,6 +216,10 @@ files:
 - lib/textbringer/face.rb
 - lib/textbringer/faces/basic.rb
 - lib/textbringer/faces/programming.rb
+- lib/textbringer/input_method.rb
+- lib/textbringer/input_methods/hiragana_input_method.rb
+- lib/textbringer/input_methods/t_code_input_method.rb
+- lib/textbringer/input_methods/t_code_input_method/tables.rb
 - lib/textbringer/keymap.rb
 - lib/textbringer/mode.rb
 - lib/textbringer/modes/backtrace_mode.rb
@@ -245,14 +251,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: An Emacs-like text editor