textbringer 1.4.1 → 2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32799602faad1b9a13a0d298bcf922aa4fcac7430fc9f17258e457ef0463bd8
-  data.tar.gz: 853b1b04ed778c8f04117ca23bfe22e0989d79028869d54fbcca7fff65203795
+  metadata.gz: a7815997c04d50a71d83ccb13cc2b2ec378679b26e74d6a2add40635d033c7ad
+  data.tar.gz: 82193a90e99ba1d56df8c1f6cfde23ae6560585273e3c25777d55f3f7fa3c78a
 SHA512:
-  metadata.gz: 2d2cc2d14d52bdfe261a5a1499db09a76917e20040b142d5c266131fa255d90cb5823059b719f40cfb608453a1090cc4affa0abf6f741aa3bd587be47b092c87
-  data.tar.gz: c068f9f253ea113ecf2bd082600a89c5dd483a4240a1546f06e08e10e76bb22a9e0ee31fcbb753755687f43b19d73b492f3d3cb207657bd170f7a67ef382b8d9
+  metadata.gz: 6bc44799c79165fee0acf71efedd019692432da5a3b6f6c005a485587e7aecd44e2a82ba380272f42fa51a4519e1d461c9f1cdcb5f2f25f76a62029dff0358ca
+  data.tar.gz: 21ae07326bfbb38398950efcf5d0f0e9abea6195aafa26430691d2879d9e92ff3f4d50a4be5f77ed1d5082fbe776724c737ec7103d7ccd2d977638c3e160be81

data/.github/workflows/push_gem.yml

@@ -24,21 +24,21 @@ jobs:
     steps:
       # Set up
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@v2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
           ruby-version: ruby
 
       # Release
       - name: Publish to RubyGems
-        uses: rubygems/release-gem@612653d273a73bdae1df8453e090060bb4db5f31 # v1
+        uses: rubygems/release-gem@v1
 
       - name: Create GitHub release
         run: |

data/lib/textbringer/buffer.rb

@@ -71,6 +71,8 @@ module Textbringer
         false
       end
 
+    WORD_COMPONENT_REGEXP = /\p{Letter}|\p{Number}|\p{M}/
+
     if !defined?(@@detect_encoding_proc)
       @@detect_encoding_proc = DEFAULT_DETECT_ENCODING
 
@@ -683,7 +685,8 @@ module Textbringer
       forward_char(-n)
     end
 
-    def forward_word(n = 1, regexp: /\p{Letter}|\p{Number}/)
+    def forward_word(n = 1, regexp: WORD_COMPONENT_REGEXP)
+      return backward_word(-n) if n < 0
       n.times do
         while !end_of_buffer? && regexp !~ char_after
           forward_char
@@ -694,7 +697,8 @@ module Textbringer
       end
     end
 
-    def backward_word(n = 1, regexp: /\p{Letter}|\p{Number}/)
+    def backward_word(n = 1, regexp: WORD_COMPONENT_REGEXP)
+      return forward_word(-n) if n < 0
       n.times do
         break if beginning_of_buffer?
         backward_char
@@ -820,6 +824,10 @@ module Textbringer
       @point > mark.location
     end
 
+    def point_compare_mark(mark)
+      @point - mark.location
+    end
+
     def exchange_point_and_mark(mark = @mark)
       if mark.nil?
         raise EditorError, "The mark is not set"
@@ -989,14 +997,23 @@ module Textbringer
       end
     end
 
-    def replace(str, start: point_min, end: point_max)
+    def replace(str = nil, start: point_min, end: point_max, &block)
+      end_pos = binding.local_variable_get(:end)
+      if str.nil?
+        str = block.call(substring(start, end_pos))
+      end
       composite_edit do
-        delete_region(start, binding.local_variable_get(:end))
+        delete_region(start, end_pos)
         goto_char(start)
         insert(str)
       end
     end
 
+    def replace_region(str = nil, &block)
+      s, e = Buffer.region_boundaries(@point, mark)
+      replace(str, start: s, end: e, &block)
+    end
+
     def clear
       check_read_only_flag
       @contents = String.new
@@ -1040,6 +1057,27 @@ module Textbringer
       end
     end
 
+    def convert_word(n = 1, &block)
+      s = point
+      forward_word(n)
+      e = point
+      s, e = Buffer.region_boundaries(s, e)
+      str = substring(s, e).gsub(/[\p{Letter}\p{Number}]+/, &block)
+      replace(str, start: s, end: e)
+    end
+
+    def downcase_word(n = 1)
+      convert_word(n, &:downcase)
+    end
+
+    def upcase_word(n = 1)
+      convert_word(n, &:upcase)
+    end
+
+    def capitalize_word(n = 1)
+      convert_word(n, &:capitalize)
+    end
+
     def insert_for_yank(s)
       if @mark.nil? || !point_at_mark?(@mark)
         push_mark
@@ -1441,7 +1479,7 @@ module Textbringer
     def set_contents(s, enc)
       case s.encoding
       when Encoding::UTF_8, Encoding::ASCII_8BIT
-        @contents = s.frozen? ? s.dup : s
+        @contents = +s
       else
         @contents = s.encode(Encoding::UTF_8)
       end

data/lib/textbringer/commands/buffers.rb

@@ -264,5 +264,38 @@ module Textbringer
       e = buffer.re_search_forward(Regexp.quote(char), count: count)
       buffer.kill_region(s, e)
     end
+
+    define_command(:downcase_word,
+                    doc: <<~EOD) do
+        Convert to lower case from point to end of word, moving over.
+      EOD
+      |n = number_prefix_arg|
+      Buffer.current.downcase_word(n)
+    end
+
+    define_command(:upcase_word,
+                   doc: <<~EOD) do
+        Convert to upper case from point to end of word, moving over.
+      EOD
+      |n = number_prefix_arg|
+      Buffer.current.upcase_word(n)
+    end
+
+    define_command(:capitalize_word,
+                    doc: <<~EOD) do
+        Capitalize from point to the end of word, moving over.
+      EOD
+      |n = number_prefix_arg|
+      Buffer.current.capitalize_word(n)
+    end
+
+    define_command(:insert_char,
+                    doc: <<~EOD) do
+        Insert character.
+      EOD
+      |c = read_from_minibuffer("Insert character (hex): "),
+        n = number_prefix_arg|
+      Buffer.current.insert(c.hex.chr(Encoding::UTF_8) * n)
+    end
   end
 end

data/lib/textbringer/commands/files.rb

@@ -128,7 +128,7 @@ module Textbringer
       |dir_name = read_file_name("Change directory: ",
                                  default: Buffer.current.file_name &&
                                  File.dirname(Buffer.current.file_name))|
-      Dir.chdir(dir_name)
+      Dir.chdir(File.expand_path(dir_name))
     end
 
     define_command(:find_alternate_file, doc: "Find an alternate file.") do

data/lib/textbringer/commands/help.rb

@@ -18,9 +18,14 @@ module Textbringer
         help.clear
         yield(help)
         help.beginning_of_buffer
-        switch_to_buffer(help)
-        help_mode
+        help.apply_mode(HelpMode)
       end
+      if Window.list.size == 1
+        split_window
+      end
+      windows = Window.list
+      i = (windows.index(Window.current) + 1) % windows.size
+      windows[i].buffer = help
     end
     private :show_help
 
@@ -143,6 +148,43 @@ module Textbringer
       push_help_command([:describe_method, name])
     end
 
+    define_command(:describe_char,
+                   doc: "Describe the char after point") do
+      require "unicode/name"
+      require "unicode/categories"
+      require "unicode/blocks"
+      require "unicode/scripts"
+      require "unicode/types"
+
+      show_help do |help|
+        buffer = Buffer.current
+        c = buffer.char_after
+        if c.nil?
+          raise "No character follows specified position"
+        end
+        percent = (100.0 * buffer.point / buffer.bytesize).to_i
+        char = /[\0-\x20\x7f]/.match?(c) ? Keymap.key_name(c) : c
+        codepoint = "U+%04X" % c.ord
+        name = Unicode::Name.readable(c)
+        category = Unicode::Categories.category(c)
+        category_long = Unicode::Categories.category(c, format: :long)
+        script = Unicode::Scripts.script(c)
+        block = Unicode::Blocks.block(c)
+        type = Unicode::Types.type(c)
+        help.insert(<<EOF)
+ position: #{buffer.point} of #{buffer.bytesize} (#{percent}%), column: #{buffer.current_column}
+character: #{char}
+codepoint: #{codepoint}
+     name: #{name}
+ category: #{category} (#{category_long})
+   script: #{script}
+    block: #{block}
+     type: #{type}
+EOF
+      end
+      push_help_command([:describe_char])
+    end
+
     define_command(:help_go_back, doc: "Go back to the previous help.") do
       if !HELP_RING.empty?
         HELP_RING.rotate(1)

data/lib/textbringer/commands/misc.rb

@@ -353,5 +353,30 @@ module Textbringer
     define_command(:jit_resume) do
       RubyVM::MJIT.resume
     end
+
+    define_command(:what_cursor_position,
+                   doc: "Print info on cursor position.") do
+      |arg = current_prefix_arg|
+
+      buffer = Buffer.current
+      c = buffer.char_after
+      if c
+        char = format("Char: %s (U+%04X) ",
+                      /[\0-\x20\x7f]/.match?(c) ? Keymap.key_name(c) : c,
+                      c.ord)
+      else
+        char = ""
+      end
+      if buffer.bytesize == 0
+        percent = "EOB"
+      else
+        percent = (100.0 * buffer.point / buffer.bytesize).to_i
+      end
+      column = buffer.current_column
+      message("#{char}point=#{buffer.point} of #{buffer.bytesize} (#{percent}%) column=#{column}")
+      if arg && c
+        describe_char
+      end
+    end
   end
 end

data/lib/textbringer/commands/register.rb

@@ -88,7 +88,10 @@ module Textbringer
 
     define_command(:insert_register) do
       |register = read_register("Insert register:"),
-        arg = current_prefix_arg|
+        arg = nil|
+      if arg.nil? && Controller.current.this_command == :insert_register
+        arg = !current_prefix_arg
+      end
       buffer = Buffer.current
       str = REGISTERS[register]
       if arg

data/lib/textbringer/commands/ucs_normalize.rb

@@ -0,0 +1,39 @@
+module Textbringer
+  module Commands
+    define_command(:ucs_normalize_nfc_region,
+                   doc: <<~EOD) do
+        Compose the region according to the Unicode NFC.
+      EOD
+      Buffer.current.replace_region do |s|
+        s.unicode_normalize(:nfc)
+      end
+    end
+
+    define_command(:ucs_normalize_nfd_region,
+                   doc: <<~EOD) do
+        Decompose the region according to the Unicode NFD.
+      EOD
+      Buffer.current.replace_region do |s|
+        s.unicode_normalize(:nfd)
+      end
+    end
+
+    define_command(:ucs_normalize_nfkc_region,
+                   doc: <<~EOD) do
+        Compose the region according to the Unicode NFKC.
+      EOD
+      Buffer.current.replace_region do |s|
+        s.unicode_normalize(:nfkc)
+      end
+    end
+
+    define_command(:ucs_normalize_nfkd_region,
+                   doc: <<~EOD) do
+        Decompose the region according to the Unicode NFKD.
+      EOD
+      Buffer.current.replace_region do |s|
+        s.unicode_normalize(:nfkd)
+      end
+    end
+  end
+end

data/lib/textbringer/default_output.rb

@@ -9,10 +9,18 @@ module Textbringer
     def flush
     end
 
-    def method_missing(mid, ...)
-      buffer = StringIO.new
-      buffer.send(mid, ...)
-      write(buffer.string)
+    [
+      :print,
+      :printf,
+      :putc,
+      :puts,
+      :"<<"
+    ].each do |mid|
+      define_method(mid) do |*args|
+        buffer = StringIO.new
+        buffer.send(mid, *args)
+        write(buffer.string)
+      end
     end
   end
 end

data/lib/textbringer/input_method.rb

@@ -59,5 +59,27 @@ module Textbringer
     def handle_event(event)
       raise EditorError, "subclass must override InputMethod#handle_event"
     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
+        @isearch_buffer.modified = false
+        begin
+          block.call(@isearch_buffer)
+        ensure
+          ISEARCH_STATUS[:string] = @isearch_buffer.to_s
+          isearch_search if @isearch_buffer.modified?
+          if Buffer.current != Buffer.minibuffer
+            message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
+          end
+          Window.redisplay
+        end
+      else
+        block.call(Buffer.current)
+      end
+    end
   end
 end

data/lib/textbringer/input_methods/hangul_input_method.rb

@@ -0,0 +1,73 @@
+module Textbringer
+  class HangulInputMethod < InputMethod
+    KEY_TO_COMPATIBILITY_JAMO = {
+      "q" => "ㅂ", "w" => "ㅈ", "e" => "ㄷ", "r" => "ㄱ", "t" => "ㅅ",
+      "y" => "ㅛ", "u" => "ㅕ", "i" => "ㅑ", "o" => "ㅐ", "p" => "ㅔ",
+      "a" => "ㅁ", "s" => "ㄴ", "d" => "ㅇ", "f" => "ㄹ", "g" => "ㅎ",
+      "h" => "ㅗ", "j" => "ㅓ", "k" => "ㅏ", "l" => "ㅣ",
+      "z" => "ㅋ", "x" => "ㅌ", "c" => "ㅊ", "v" => "ㅍ", "b" => "ㅠ",
+      "n" => "ㅜ", "m" => "ㅡ",
+      "Q" => "ㅃ", "W" => "ㅉ", "E" => "ㄸ", "R" => "ㄲ", "T" => "ㅆ",
+      "O" => "ㅒ", "P" => "ㅖ"
+    }
+
+    COMPATIBILITY_JAMO_TO_FINAL = {
+      "ㄱ" => "ᆨ", "ㄲ" => "ᆩ", "ㄳ" => "ᆪ", "ㄴ" => "ᆫ",
+      "ㄵ" => "ᆬ", "ㄶ" => "ᆭ", "ㄷ" => "ᆮ", "ㄹ" => "ᆯ",
+      "ㄺ" => "ᆰ", "ㄻ" => "ᆱ", "ㄼ" => "ᆲ", "ㄽ" => "ᆳ",
+      "ㄾ" => "ᆴ", "ㄿ" => "ᆵ", "ㅀ" => "ᆶ", "ㅁ" => "ᆷ",
+      "ㅂ" => "ᆸ", "ㅄ" => "ᆹ", "ㅅ" => "ᆺ", "ㅆ" => "ᆻ",
+      "ㅇ" => "ᆼ", "ㅈ" => "ᆽ", "ㅊ" => "ᆾ", "ㅋ" => "ᆿ",
+      "ㅌ" => "ᇀ", "ㅍ" => "ᇁ", "ㅎ" => "ᇂ"
+    }
+
+    FINAL_TO_INITIAL = {
+      "ᆨ" => "ᄀ", "ᆩ" => "ᄁ", "ᆫ" => "ᄂ", "ᆮ" => "ᄃ",
+      "ᆯ" => "ᄅ", "ᆷ" => "ᄆ", "ᆸ" => "ᄇ", "ᆺ" => "ᄉ",
+      "ᆻ" => "ᄊ", "ᆼ" => "ᄋ", "ᆽ" => "ᄌ", "ᆾ" => "ᄎ",
+      "ᆿ" => "ᄏ", "ᇀ" => "ᄐ", "ᇁ" => "ᄑ", "ᇂ" => "ᄒ"
+    }
+
+    def status
+      "한"
+    end
+
+    def handle_event(event)
+      return event if !event.is_a?(String)
+      jamo = KEY_TO_COMPATIBILITY_JAMO[event]
+      return event if jamo.nil?
+      with_target_buffer do |buffer|
+        prev = buffer.char_before
+        if /[\u{3131}-\u{3183}\u{ac00}-\u{d7a3}]/.match?(prev) # jamo or syllables
+          decomposed_prev, prev = decompose_prev(prev, jamo)
+          if c = compose_hangul(prev, jamo)
+            buffer.backward_delete_char
+            c = decomposed_prev + c if decomposed_prev
+            buffer.insert(c)
+            Window.redisplay
+            return nil
+          end
+        end
+      end
+      jamo
+    end
+
+    def decompose_prev(prev, jamo)
+      if /[\u{ac00}-\u{d7a3}]/.match?(prev) && # syllables
+        /[\u{314f}-\u{3163}]/.match?(jamo) # vowels
+        s = prev.unicode_normalize(:nfd)
+        if s.size == 3 && (initial = FINAL_TO_INITIAL[s[2]])
+          return s[0, 2].unicode_normalize(:nfc), initial
+        end
+      end
+      return nil, prev
+    end
+
+    def compose_hangul(prev, jamo)
+      # Use NFKC for compatibility jamo
+      c = (prev + (COMPATIBILITY_JAMO_TO_FINAL[jamo] || jamo)).
+        unicode_normalize(:nfkc)
+      c.size == 1 ? c : nil
+    end
+  end
+end

data/lib/textbringer/input_methods/hiragana_input_method.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class HiraganaInputMethod < InputMethod
     HIRAGANA_TABLE = {

data/lib/textbringer/input_methods/t_code_input_method.rb

@@ -86,23 +86,6 @@ module Textbringer
       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
@@ -117,7 +100,6 @@ module Textbringer
           buffer.goto_char(pos)
         end
       end
-      isearch_search if isearch_mode?
       Window.redisplay
       nil
     end
@@ -276,7 +258,6 @@ module Textbringer
           buffer.insert(s + @mazegaki_suffix)
         end
       end
-      isearch_search if isearch_mode?
     end
 
     def hide_help_window

data/lib/textbringer/keymap.rb

@@ -215,6 +215,11 @@ module Textbringer
   GLOBAL_MAP.define_key([:f1, "m"], :describe_method)
   GLOBAL_MAP.define_key("\C-x#", :server_edit_done)
   GLOBAL_MAP.define_key("\C-\\", :toggle_input_method)
+  GLOBAL_MAP.define_key("\M-l", :downcase_word)
+  GLOBAL_MAP.define_key("\M-u", :upcase_word)
+  GLOBAL_MAP.define_key("\M-c", :capitalize_word)
+  GLOBAL_MAP.define_key("\C-x8\C-m", :insert_char)
+  GLOBAL_MAP.define_key("\C-x=", :what_cursor_position)
   GLOBAL_MAP.handle_undefined_key do |key|
     if key.is_a?(String) && /[\0-\x7f]/ !~ key
       :self_insert

data/lib/textbringer/mode.rb

@@ -6,7 +6,7 @@ module Textbringer
     @@mode_list = []
 
     DEFAULT_SYNTAX_TABLE = {
-      control: /[\0-\t\v-\x1f\x7f\u{3000}]+/
+      control: /\p{C}+/
     }
 
     def self.list

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "1.4.1"
+  VERSION = "2"
 end

data/lib/textbringer/window/fallback_characters.rb

@@ -0,0 +1,81 @@
+module Textbringer
+  class Window
+    FALLBACK_CHARACTERS = {
+      # Hiragana
+      "゙" => "゛",
+      "゚" => "゜",
+
+      # Hangul jamo
+      ## initial
+      "ᄀ" => "ㄱ",
+      "ᄁ" => "ㄲ",
+      "ᄂ" => "ㄴ",
+      "ᄃ" => "ㄷ",
+      "ᄄ" => "ㄸ",
+      "ᄅ" => "ㄹ",
+      "ᄆ" => "ㅁ",
+      "ᄇ" => "ㅂ",
+      "ᄈ" => "ㅃ",
+      "ᄉ" => "ㅅ",
+      "ᄊ" => "ㅆ",
+      "ᄋ" => "ㅇ",
+      "ᄌ" => "ㅈ",
+      "ᄍ" => "ㅉ",
+      "ᄎ" => "ㅊ",
+      "ᄏ" => "ㅋ",
+      "ᄐ" => "ㅌ",
+      "ᄑ" => "ㅍ",
+      "ᄒ" => "ㅎ",
+      ## medial
+      "ᅡ" => "ㅏ",
+      "ᅢ" => "ㅐ",
+      "ᅣ" => "ㅑ",
+      "ᅤ" => "ㅒ",
+      "ᅥ" => "ㅓ",
+      "ᅦ" => "ㅔ",
+      "ᅧ" => "ㅕ",
+      "ᅨ" => "ㅖ",
+      "ᅩ" => "ㅗ",
+      "ᅪ" => "ㅘ",
+      "ᅫ" => "ㅙ",
+      "ᅬ" => "ㅚ",
+      "ᅭ" => "ㅛ",
+      "ᅮ" => "ㅜ",
+      "ᅯ" => "ㅝ",
+      "ᅰ" => "ㅞ",
+      "ᅱ" => "ㅟ",
+      "ᅲ" => "ㅠ",
+      "ᅳ" => "ㅡ",
+      "ᅴ" => "ㅢ",
+      "ᅵ" => "ㅣ",
+      ## final
+      "ᆨ" => "ㄱ",
+      "ᆩ" => "ㄲ",
+      "ᆪ" => "ㄳ",
+      "ᆫ" => "ㄴ",
+      "ᆬ" => "ㄵ",
+      "ᆭ" => "ㄶ",
+      "ᆮ" => "ㄷ",
+      "ᆯ" => "ㄹ",
+      "ᆰ" => "ㄺ",
+      "ᆱ" => "ㄻ",
+      "ᆲ" => "ㄼ",
+      "ᆳ" => "ㄽ",
+      "ᆴ" => "ㄾ",
+      "ᆵ" => "ㄿ",
+      "ᆶ" => "ㅀ",
+      "ᆷ" => "ㅁ",
+      "ᆸ" => "ㅂ",
+      "ᆹ" => "ㅄ",
+      "ᆺ" => "ㅅ",
+      "ᆻ" => "ㅆ",
+      "ᆼ" => "ㅇ",
+      "ᆽ" => "ㅈ",
+      "ᆾ" => "ㅊ",
+      "ᆿ" => "ㅋ",
+      "ᇀ" => "ㅌ",
+      "ᇁ" => "ㅍ",
+      "ᇂ" => "ㅎ"
+    }
+  end
+end

data/lib/textbringer/window.rb

@@ -1,7 +1,10 @@
 require "curses"
+require_relative "window/fallback_characters"
 
 module Textbringer
   class Window
+    Cursor = Struct.new(:y, :x)
+
     KEY_NAMES = {}
     Curses.constants.grep(/\AKEY_/).each do |name|
       KEY_NAMES[Curses.const_get(name)] =
@@ -232,6 +235,7 @@ module Textbringer
       @deleted = false
       @raw_key_buffer = []
       @key_buffer = []
+      @cursor = Cursor.new(0, 0)
     end
 
     def echo_area?
@@ -395,7 +399,7 @@ module Textbringer
           @buffer.point_to_mark(@point_mark)
         end
         framer
-        y = x = 0
+        @cursor.y = @cursor.x = 0
         @buffer.point_to_mark(@top_of_window)
         highlight
         @window.erase
@@ -406,25 +410,9 @@ module Textbringer
           @window.attron(Curses::A_REVERSE)
         end
         while !@buffer.end_of_buffer?
-          cury, curx = @window.cury, @window.curx
-          if @buffer.point_at_mark?(point)
-            y, x = cury, curx
-            if current? && @buffer.visible_mark
-              if @buffer.point_after_mark?(@buffer.visible_mark)
-                @window.attroff(Curses::A_REVERSE)
-              elsif @buffer.point_before_mark?(@buffer.visible_mark)
-                @window.attron(Curses::A_REVERSE)
-              end
-            end
-          end
-          if current? && @buffer.visible_mark &&
-             @buffer.point_at_mark?(@buffer.visible_mark)
-            if @buffer.point_after_mark?(point)
-              @window.attroff(Curses::A_REVERSE)
-            elsif @buffer.point_before_mark?(point)
-              @window.attron(Curses::A_REVERSE)
-            end
-          end
+          cury = @window.cury
+          curx = @window.curx
+          update_cursor_and_attr(point, cury, curx)
           if attrs = @highlight_off[@buffer.point]
             @window.attroff(attrs)
           end
@@ -442,12 +430,13 @@ module Textbringer
             n = calc_tab_width(curx)
             c = " " * n
           else
-            c = escape(c)
+            c = compose_character(point, cury, curx, c)
           end
+          s = escape(c)
           if curx < columns - 4
             newx = nil
           else
-            newx = curx + Buffer.display_width(c)
+            newx = curx + Buffer.display_width(s)
             if newx > columns
               if cury == lines - 2
                 break
@@ -457,12 +446,7 @@ module Textbringer
               end
             end
           end
-          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
+          @window.addstr(s)
           break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end
@@ -471,16 +455,17 @@ module Textbringer
         end
         @buffer.mark_to_point(@bottom_of_window)
         if @buffer.point_at_mark?(point)
-          y, x = @window.cury, @window.curx
+          @cursor.y = @window.cury
+          @cursor.x = @window.curx
         end
-        if x == columns - 1
+        if @cursor.x == columns - 1
           c = @buffer.char_after(point.location)
           if c && Buffer.display_width(c) > 1
-            y += 1
-            x = 0
+            @cursor.y += 1
+            @cursor.x = 0
           end
         end
-        @window.setpos(y, x)
+        @window.setpos(@cursor.y, @cursor.x)
         @window.noutrefresh
       end
     end
@@ -690,6 +675,86 @@ module Textbringer
       "0x" + c.unpack("H*")[0]
     end
 
+    def update_cursor_and_attr(point, cury, curx)
+      if @buffer.point_at_mark?(point)
+        @cursor.y = cury
+        @cursor.x = curx
+        if current? && @buffer.visible_mark
+          if @buffer.point_after_mark?(@buffer.visible_mark)
+            @window.attroff(Curses::A_REVERSE)
+          elsif @buffer.point_before_mark?(@buffer.visible_mark)
+            @window.attron(Curses::A_REVERSE)
+          end
+        end
+      end
+      if current? && @buffer.visible_mark &&
+         @buffer.point_at_mark?(@buffer.visible_mark)
+        if @buffer.point_after_mark?(point)
+          @window.attroff(Curses::A_REVERSE)
+        elsif @buffer.point_before_mark?(point)
+          @window.attron(Curses::A_REVERSE)
+        end
+      end
+    end
+
+    def compose_character(point, cury, curx, c)
+      return c if @buffer.binary? || c.nil? || c.match?(/\p{M}/)
+      if c.match?(/[\u{1100}-\u{115f}]/) # hangul initial consonants
+        return compose_hangul_character(point, cury, curx, c)
+      end
+      pos = @buffer.point + c.bytesize
+      while nextc = @buffer.char_after(pos)
+        case nextc
+        when /[\u{fe00}-\u{fe0f}\u{e0100}-\u{e01ef}]/ # variation selectors
+          c += nextc
+        when /[\p{Mn}\p{Me}]/ # nonspacing & enclosing marks
+          # Normalize パ (U+30CF + U+309A) to パ (U+30D1) so that curses can
+          # caluculate display width correctly.
+          # Display combining marks by codepoint when characters cannot be
+          # combined by NFC.
+          newc = (c + nextc).unicode_normalize(:nfc)
+          return c if newc.size != c.size
+          c = newc
+        else
+          return c
+        end
+        @buffer.forward_char
+        update_cursor_and_attr(point, cury, curx)
+        pos += nextc.bytesize
+      end
+      c
+    end
+
+    def compose_hangul_character(point, cury, curx, initial)
+      pos = @buffer.point + initial.bytesize
+      medial = @buffer.char_after(pos)
+      if !medial&.match?(/[\u{1160}-\u{11a7}]/)
+        return initial
+      end
+      final = @buffer.char_after(pos + medial.bytesize)
+      if final&.match?(/[\u{11a8}-\u{11ff}]/)
+        newc = (initial + medial + final).unicode_normalize(:nfc)
+        if newc.size == 1
+          2.times do
+            @buffer.forward_char
+            update_cursor_and_attr(point, cury, curx)
+          end
+          newc
+        else
+          c
+        end
+      else
+        newc = (initial + medial).unicode_normalize(:nfc)
+        if newc.size == 1
+          @buffer.forward_char
+          update_cursor_and_attr(point, cury, curx)
+          newc
+        else
+          c
+        end
+      end
+    end
+
     def escape(s)
       if !s.valid_encoding?
         s = s.b
@@ -701,8 +766,23 @@ module Textbringer
           "<%02X>" % c.ord
         }
       else
-        s.gsub(/[\0-\b\v-\x1f\x7f]/) { |c|
-          "^" + (c.ord ^ 0x40).chr
+        s.gsub(/
+          (?<ascii_control>[\0-\b\v-\x1f\x7f])
+        | (?<nonascii_control>\p{C})
+        | (?<combining_diacritical_mark>[\u{0300}-\u{036f}])
+        | (?<other_special_char>[\p{M}\u{1100}-\u{11ff}])
+        /x) { |c|
+          if $~[:ascii_control]
+            "^" + (c.ord ^ 0x40).chr
+          elsif $~[:nonascii_control]
+            "<%04x>" % c.ord
+          elsif $~[:combining_diacritical_mark]
+            # Use U+00A0 as the base character, following the convention
+            # described in section 2.11.4 of Unicode Standard 16.0.0
+            "\u{00a0}#{c}"
+          elsif $~[:other_special_char]
+            FALLBACK_CHARACTERS[c] || c
+          end
         }
       end
     end
@@ -836,8 +916,12 @@ module Textbringer
 
     def redisplay
       return if @buffer.nil?
-      @buffer.save_point do |saved|
+      @buffer.save_point do |point|
         @window.erase
+        if @buffer.input_method_status != "--"
+          @window.setpos(@window.cury, editable_columns + 1)
+          @window.addstr(@buffer.input_method_status)
+        end
         @window.setpos(0, 0)
         if @message
           @window.addstr(escape(@message))
@@ -846,29 +930,30 @@ module Textbringer
           @window.addstr(prompt)
           framer
           @buffer.point_to_mark(@top_of_window)
-          y = x = 0
+          @cursor.y = @cursor.x = 0
           while !@buffer.end_of_buffer?
-            cury, curx = @window.cury, @window.curx
-            if @buffer.point_at_mark?(saved)
-              y, x = cury, curx
-            end
+            cury = @window.cury
+            curx = @window.curx
+            update_cursor_and_attr(point, cury, curx)
             c = @buffer.char_after
             if c == "\n"
               break
             end
+            c = compose_character(point, cury, curx, c)
             s = escape(c)
             newx = curx + Buffer.display_width(s)
-            if newx > @columns
+            if newx > editable_columns
               break
             end
             @window.addstr(s)
-            break if newx >= @columns
             @buffer.forward_char
+            break if newx >= editable_columns
           end
-          if @buffer.point_at_mark?(saved)
-            y, x = @window.cury, @window.curx
+          if @buffer.point_at_mark?(point)
+            @cursor.y = @window.cury
+            @cursor.x = @window.curx
           end
-          @window.setpos(y, x)
+          @window.setpos(@cursor.y, @cursor.x)
         end
         @window.noutrefresh
       end
@@ -890,6 +975,14 @@ module Textbringer
       @window.resize(lines, columns)
     end
 
+    def editable_columns
+      if @buffer.input_method_status == "--"
+        @columns
+      else
+        @columns - Buffer.display_width(@buffer.input_method_status) - 1
+      end
+    end
+
     private
 
     def initialize_window(num_lines, num_columns, y, x)
@@ -902,7 +995,7 @@ module Textbringer
 
     def framer
       @buffer.save_point do |saved|
-        max_width = @columns - @window.curx
+        max_width = editable_columns - @window.curx
         width = 0
         loop do
           c = @buffer.char_after

data/lib/textbringer.rb

@@ -23,6 +23,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/ucs_normalize"
 require_relative "textbringer/commands/help"
 require_relative "textbringer/mode"
 require_relative "textbringer/modes/fundamental_mode"
@@ -36,6 +37,7 @@ 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/input_methods/hangul_input_method"
 require_relative "textbringer/plugin"
 require_relative "textbringer/controller"
 require_relative "textbringer/default_output"

data/textbringer.gemspec

@@ -21,14 +21,23 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 3.1'
 
+  spec.add_runtime_dependency "rdoc"
+  spec.add_runtime_dependency "ostruct"
+  spec.add_runtime_dependency "irb"
   spec.add_runtime_dependency "nkf"
   spec.add_runtime_dependency "drb"
   spec.add_runtime_dependency "curses", ">= 1.2.7"
   spec.add_runtime_dependency "unicode-display_width", ">= 1.1"
   spec.add_runtime_dependency "clipboard", ">= 1.1"
+  spec.add_runtime_dependency "fiddle"
   spec.add_runtime_dependency "fiddley", ">= 0.0.5"
   spec.add_runtime_dependency "editorconfig"
   spec.add_runtime_dependency "warning"
+  spec.add_runtime_dependency "unicode-name"
+  spec.add_runtime_dependency "unicode-categories"
+  spec.add_runtime_dependency "unicode-blocks"
+  spec.add_runtime_dependency "unicode-scripts"
+  spec.add_runtime_dependency "unicode-types"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", ">= 12.0"

metadata

@@ -1,15 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: '2'
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nkf
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fiddley
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +177,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-name
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-categories
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-blocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-scripts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +364,7 @@ files:
 - lib/textbringer/commands/register.rb
 - lib/textbringer/commands/replace.rb
 - lib/textbringer/commands/server.rb
+- lib/textbringer/commands/ucs_normalize.rb
 - lib/textbringer/commands/windows.rb
 - lib/textbringer/config.rb
 - lib/textbringer/controller.rb
@@ -248,6 +374,7 @@ files:
 - lib/textbringer/faces/basic.rb
 - lib/textbringer/faces/programming.rb
 - lib/textbringer/input_method.rb
+- lib/textbringer/input_methods/hangul_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
@@ -266,6 +393,7 @@ files:
 - lib/textbringer/utils.rb
 - lib/textbringer/version.rb
 - lib/textbringer/window.rb
+- lib/textbringer/window/fallback_characters.rb
 - logo/logo.jpg
 - logo/logo.png
 - screenshot.png
@@ -274,7 +402,6 @@ homepage: https://github.com/shugo/textbringer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -289,8 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []