textbringer 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f26fbba03cd3a598394d22f7edee8521b01c0ff0492c41fff8b2ede22dfbc321
-  data.tar.gz: 2eb497b690e8a3c36a724a68675daeae0ca29936bd42a5ac367abf5b8408e751
+  metadata.gz: f10c30433280a10e91f251f04f68ddd5b2cf02347de8712a9828b4488d49f7b4
+  data.tar.gz: fced66d8271da69b0bc8425c00f8dade0e8f4ee842bd6454d3584455a4d9cc9d
 SHA512:
-  metadata.gz: 4d39ca69665b6383083bab06f724d961c9d88c41d50ac23c1abc44c15ec9d4440b6d9fff304c49d96b150d9c2145382d466f5449707a5d6c350247bc2726d08f
-  data.tar.gz: e6baed2d72e9af279bded9ece8671dabb8cdddce1230b4fe308eb7c20fd875d6c0ebd5e98eb8f0ad75d450642c221bcd1c1481a194267b739ee47c4ebabd8fd1
+  metadata.gz: b69a7f035f1d502845d50ac578e25a02546207e0a7c3bc84ffd45c7bb1b2f8f58e833540c3b1f01e617923e1f74dc1fdd26ea4e1f7ad28d476ba198585ea05be
+  data.tar.gz: 98363d4a9d74c8b8ff785e244f07d982214a5fd40029c5cf634c48d6e214d084d4939bf58b5bd97008051771dd96522bc78e2bb981dcca611eeafc78d6713101

data/.github/workflows/macos.yml

@@ -3,14 +3,21 @@ name: macos
 on: [push]
 
 jobs:
-  build:
+  test:
     runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: [ head, 3.3 ]
     timeout-minutes: 10
+    env:
+      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
       run: |
-        gem install bundler --no-document
         bundle install
     - name: Run test
       run: bundle exec rake test

data/.github/workflows/ubuntu.yml

@@ -4,20 +4,21 @@ on: [push]
 
 jobs:
   test:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ head, 3.1, 3.0, 2.7 ]
-    runs-on: ubuntu-latest
+        ruby: [ head, 3.3, 3.2, 3.1 ]
     timeout-minutes: 10
+    env:
+      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
       run: |
         sudo apt install libncursesw5-dev
-        gem install bundler --no-document
         bundle install
     - name: Run test
       run: xvfb-run bundle exec rake test

data/.github/workflows/windows.yml

@@ -3,14 +3,16 @@ name: windows
 on: [push]
 
 jobs:
-  build:
+  test:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ 'mingw', 'mswin', '3.0', '2.7' ]
+        ruby: [ 'mingw', 'mswin', '3.3' ]
     timeout-minutes: 10
+    env:
+      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGES.md

@@ -1,3 +1,14 @@
+This file is no longer being updated after version 1.3.0.
+For changes since version 1.3.0, see <URL:https://github.com/shugo/textbringer/releases>.
+
+## 1.3.0
+
+* Kernel#print etc. inserts the given string into the current buffer now.
+* Add find_source.
+* Add describe_class and describe_method.
+* Support completion for eval_expression
+* Fix digraph indentation in C mode.
+
 ## 1.2.0
 
 * Drop Ruby 2.6 support.

data/README.ja.md

@@ -0,0 +1,104 @@
+# ![Textbringer](logo/logo.png)
+
+[![LatestVer](https://badgen.net/badge/latestver/0.1)](https://latestver.org/)
+[![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
+[![ubuntu](https://github.com/shugo/textbringer/workflows/ubuntu/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Aubuntu)
+[![windows](https://github.com/shugo/textbringer/workflows/windows/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Awindows)
+[![macos](https://github.com/shugo/textbringer/workflows/macos/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Amacos)
+
+TextbringerはRubyで実装されたEmacsライクなテキストエディタです。
+Lispの代りにRubyで拡張することができます。
+
+## スクリーンショット
+
+![Screenshot](screenshot.png)
+
+## デモ
+
+* FizzBuzz: https://asciinema.org/a/103357
+* Rubyプログラミング: https://asciinema.org/a/100156
+* 日本語テキストの編集: https://asciinema.org/a/100166
+
+## インストール
+
+    $ gem install textbringer
+
+マルチバイト文字を使用するためにはncurseswが必要です。
+Textbringerが依存するcurses.gemをインストールする前に、ncurseswをインストールしておいてください。
+
+    $ sudo apt-get install libncursesw5-dev
+    $ gem install curses
+
+## 使い方
+
+    $ txtb
+
+`Ctrl-x Ctrl-c` で終了できます。　
+
+多くのコマンドとキーバインディングは[Emacs](https://www.gnu.org/software/emacs/)に似ています。
+
+キーバインディングを確認するには、 `F1 b` または `Alt+x describe_bindings RET` とタイプしてください。
+
+## 設定
+
+### メタキー
+
+端末エミュレータでメタキーを使用するためには、以下のような設定が必要です。
+
+#### xterm
+
+~/.Xresourcesに以下の行を追加してください。
+
+    XTerm*metaSendsEscape: true
+
+#### mlterm
+
+~/.mlterm/mainに以下の行を追加してください。
+
+    mod_meta_key = alt
+    mod_meta_mode = esc
+
+### 東アジアの曖昧な文字幅
+
+[曖昧な文字](http://unicode.org/reports/tr11/#Ambiguous)を全角扱いするには、以下の設定を~/.textbringer.rbに記述してください。
+
+    CONFIG[:east_asian_ambiguous_width] = 2
+
+ncurseswはwcwidth(3)を使用するため、LD_PRELOADハックやlocale charmapの修正が必要かもしれません。
+
+* https://github.com/fumiyas/wcwidth-cjk
+* https://github.com/hamano/locale-eaw
+
+xterm、 mlterm、screenにはそれぞれ独自の設定項目があります。
+
+#### xterm
+
+~/.Xresourcesに以下の設定を追加してください。
+
+    xterm*utf8: 1
+    xterm*locale: true
+    xterm*cjkWidth: true
+
+#### mlterm
+
+~/.mlterm/mainに以下の設定を追加してください。
+
+    col_size_of_width_a = 2
+
+#### screen
+
+~/.screenrcに以下の設定を追加してください。
+
+    cjkwidth on
+
+## プラグイン
+
+* [Mournmail](https://github.com/shugo/mournmail): 電子メールクライアント
+* [MedicineShield](https://github.com/shugo/medicine_shield): Mastodonクライアント
+* [textbringer-presentation](https://github.com/shugo/textbringer-presentation): プレゼンテーションツール
+* [textbringer-ghost_text](https://github.com/shugo/textbringer-ghost_text): [GhostText](https://github.com/fregante/GhostText)プラグイン
+
+## ライセンス
+
+[MIT License](http://opensource.org/licenses/MIT)の下でオープンソースとして利用可能です。
+

data/README.md

@@ -1,12 +1,15 @@
 # ![Textbringer](logo/logo.png)
 
+[![LatestVer](https://badgen.net/badge/latestver/0.1)](https://latestver.org/)
 [![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
 [![ubuntu](https://github.com/shugo/textbringer/workflows/ubuntu/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Aubuntu)
 [![windows](https://github.com/shugo/textbringer/workflows/windows/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Awindows)
 [![macos](https://github.com/shugo/textbringer/workflows/macos/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Amacos)
 
-Textbringer is a member of a demon race that takes on the form of an Emacs-like
-text editor.
+* [Japanese version](README.ja.md)
+
+Textbringer is an Emacs-like text editor written in Ruby.
+It is extensible by Ruby instead of Lisp.
 
 ## Screenshot
 
@@ -93,6 +96,13 @@ Add the following line to ~/.screenrc.
 
     cjkwidth on
 
+## Plugins
+
+* [Mournmail](https://github.com/shugo/mournmail): a mail user agent
+* [MedicineShield](https://github.com/shugo/medicine_shield): a Mastodon client
+* [textbringer-presentation](https://github.com/shugo/textbringer-presentation): a presentation tool
+* [textbringer-ghost_text](https://github.com/shugo/textbringer-ghost_text): a [GhostText](https://github.com/fregante/GhostText) plugin
+
 ## Development
 
 After checking out the repo, run `bundle install` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/exe/txtb

@@ -4,6 +4,7 @@ require "warning"
 
 Warning.ignore(/already initialized constant /)
 Warning.ignore(/previous definition of /)
+Warning.ignore(/not part of the default gems/)
 
 require "textbringer"
 
@@ -26,6 +27,7 @@ end
 Controller.current = Controller.new
 begin
   Window.start do
+    $stdout = DefaultOutput.new
     begin
       load_user_config("~/.textbringer/init.rb")
       Plugin.load_plugins

data/lib/textbringer/buffer.rb

@@ -44,7 +44,11 @@ module Textbringer
       e = NKF.guess(s)
       case e
       when Encoding::US_ASCII
-        Encoding::UTF_8
+        if s.ascii_only?
+          Encoding::UTF_8
+        else
+          Encoding::ASCII_8BIT
+        end
       when Encoding::ASCII_8BIT
         s.force_encoding(Encoding::UTF_8)
         if s.valid_encoding?
@@ -58,7 +62,14 @@ module Textbringer
       end
     }
 
-    STRING_HAS_BYTE_BASED_METHODS = String.instance_methods.include?(:bytesplice)
+    HAS_BYTEINDEX = String.instance_methods.include?(:byteindex)
+    HAS_BYTESPLICE = String.instance_methods.include?(:bytesplice)
+    BYTESPLICE_SUPPORTS_PARTIAL_COPY =
+      begin
+        (+"foo").bytesplice(0, 2, "bar", 1, 2) == "aro"
+      rescue NoMethodError, ArgumentError
+        false
+      end
 
     if !defined?(@@detect_encoding_proc)
       @@detect_encoding_proc = DEFAULT_DETECT_ENCODING
@@ -271,13 +282,6 @@ module Textbringer
     def file_encoding=(enc)
       @file_encoding = Encoding.find(enc)
       @binary = @file_encoding == Encoding::ASCII_8BIT
-      if STRING_HAS_BYTE_BASED_METHODS
-        if @binary
-          @contents.force_encoding(Encoding::ASCII_8BIT)
-        else
-          @contents.force_encoding(Encoding::UTF_8)
-        end
-      end
     end
 
     def binary?
@@ -448,7 +452,7 @@ module Textbringer
     def to_s
       result = @contents.byteslice(0...@gap_start) +
         @contents.byteslice(@gap_end..-1)
-      if !@binary && !STRING_HAS_BYTE_BASED_METHODS
+      if !@binary
         result.force_encoding(Encoding::UTF_8)
       end
       result
@@ -463,7 +467,7 @@ module Textbringer
           @contents.byteslice(user_to_gap(s), len) +
             @contents.byteslice(@gap_end, e - s - len)
         end
-      if !@binary && !STRING_HAS_BYTE_BASED_METHODS
+      if !@binary
         result.force_encoding(Encoding::UTF_8)
       end
       result
@@ -525,7 +529,7 @@ module Textbringer
       if pos == point_min
         column = 1
       else
-        if STRING_HAS_BYTE_BASED_METHODS
+        if HAS_BYTEINDEX
           begin
             i = @contents.byterindex("\n", user_to_gap(get_pos(pos, -1)))
           rescue RangeError
@@ -562,7 +566,7 @@ module Textbringer
       pos = point_min
       i = 1
       while i < n && pos < @contents.bytesize
-        if STRING_HAS_BYTE_BASED_METHODS
+        if HAS_BYTEINDEX
           pos = @contents.byteindex("\n", pos)
         else
           pos = @contents.index("\n", pos)
@@ -586,7 +590,7 @@ module Textbringer
       pos = @point
       size = s.bytesize
       adjust_gap(size)
-      splice_contents(@point, size, STRING_HAS_BYTE_BASED_METHODS ? s : s.b)
+      splice_contents(@point, size, s.b)
       @marks.each do |m|
         if m.location > @point
           m.location += size
@@ -995,10 +999,7 @@ module Textbringer
 
     def clear
       check_read_only_flag
-      @contents = +""
-      if binary? || !STRING_HAS_BYTE_BASED_METHODS
-        @contents.force_encoding(Encoding::ASCII_8BIT)
-      end
+      @contents = String.new
       @point = @gap_start = @gap_end = 0
       @marks.each do |m|
         m.location = 0
@@ -1158,7 +1159,7 @@ module Textbringer
       byteindex(true, r, @point) == @point
     end
 
-    if STRING_HAS_BYTE_BASED_METHODS
+    if HAS_BYTEINDEX
       def byteindex(forward, re, pos)
         @match_offsets = []
         method = forward ? :byteindex : :byterindex
@@ -1480,9 +1481,7 @@ module Textbringer
       else
         @contents = s.encode(Encoding::UTF_8)
       end
-      if !STRING_HAS_BYTE_BASED_METHODS
-        @contents.force_encoding(Encoding::ASCII_8BIT)
-      end
+      @contents.force_encoding(Encoding::ASCII_8BIT)
       self.file_encoding = enc
       begin
         case @contents
@@ -1502,7 +1501,7 @@ module Textbringer
       end
     end
 
-    if STRING_HAS_BYTE_BASED_METHODS
+    if HAS_BYTESPLICE
       def splice_contents(*args)
         @contents.bytesplice(*args)
       end
@@ -1515,37 +1514,37 @@ module Textbringer
     def adjust_gap(min_size = 0, pos = @point)
       if @gap_start < pos
         len = user_to_gap(pos) - @gap_end
-        s = @contents.byteslice(@gap_end, len)
         new_gap_start = @gap_start + len
         new_gap_end = @gap_end + len
         nul_filling_start = new_gap_start > @gap_end ? new_gap_start : @gap_end
-        unless @binary
-          # find the character boundary
-          while nul_filling_start > @gap_end &&
-              @contents.byteslice(nul_filling_start)&.b&.match?(/[\x80-\xbf]/n)
-            nul_filling_start -= 1
-          end
+        if BYTESPLICE_SUPPORTS_PARTIAL_COPY
+          @contents.bytesplice(@gap_start, len,
+                               @contents, @gap_end, len)
+          @contents.bytesplice(nul_filling_start...new_gap_end,
+                               "\0" * (new_gap_end - nul_filling_start))
+        else
+          s = @contents.byteslice(@gap_end, len)
+          splice_contents(nul_filling_start...new_gap_end,
+                          "\0" * (new_gap_end - nul_filling_start))
+          splice_contents(@gap_start...new_gap_start, s)
         end
-        splice_contents(nul_filling_start...new_gap_end,
-                        "\0" * (new_gap_end - nul_filling_start))
-        splice_contents(@gap_start...new_gap_start, s)
         @gap_start = new_gap_start
         @gap_end = new_gap_end
       elsif @gap_start > pos
         len = @gap_start - pos
-        s = @contents.byteslice(pos, len)
         new_gap_start = @gap_start - len
         new_gap_end = @gap_end - len
         nul_filling_end = new_gap_end < @gap_start ? new_gap_end : @gap_start
-        unless @binary
-          # find the character boundary
-          while nul_filling_end < @gap_start &&
-              @contents.byteslice(nul_filling_end)&.b&.match?(/[\x80-\xbf]/n)
-            nul_filling_end += 1
-          end
+        if BYTESPLICE_SUPPORTS_PARTIAL_COPY
+          @contents.bytesplice(new_gap_end, len,
+                               @contents, pos, len)
+          @contents.bytesplice(pos...nul_filling_end,
+                               "\0" * (nul_filling_end - pos))
+        else
+          s = @contents.byteslice(pos, len)
+          splice_contents(pos...nul_filling_end, "\0" * (nul_filling_end - pos))
+          splice_contents(new_gap_end...@gap_end, s)
         end
-        splice_contents(pos...nul_filling_end, "\0" * (nul_filling_end - pos))
-        splice_contents(new_gap_end...@gap_end, s)
         @gap_start = new_gap_start
         @gap_end = new_gap_end
       end
@@ -1619,7 +1618,7 @@ module Textbringer
           @current_column += substring(pos, new_pos).size
         else
           @current_line += n
-          if STRING_HAS_BYTE_BASED_METHODS
+          if HAS_BYTEINDEX
             begin
               i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, -1)))
             rescue RangeError
@@ -1641,7 +1640,7 @@ module Textbringer
           @current_column -= substring(new_pos, pos).size
         else
           @current_line -= n
-          if STRING_HAS_BYTE_BASED_METHODS
+          if HAS_BYTEINDEX
             begin
               i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, - 1)))
             rescue RangeError
@@ -1687,9 +1686,7 @@ module Textbringer
         @contents.byteslice(0...@gap_start),
         @contents.byteslice(@gap_end..-1)
       ].each do |s|
-        if !STRING_HAS_BYTE_BASED_METHODS
-          s.force_encoding(Encoding::UTF_8) unless @binary
-        end
+        s.force_encoding(Encoding::UTF_8) unless @binary
         case @file_format
         when :dos
           s.gsub!(/\n/, "\r\n")

data/lib/textbringer/commands/clipboard.rb

@@ -7,8 +7,7 @@ require "clipboard"
 module Textbringer
   module Commands
     CLIPBOARD_AVAILABLE =
-      Clipboard.implementation.name != "Clipboard::Linux" ||
-      (ENV["DISPLAY"] && system("which xclip > /dev/null 2>&1"))
+      Clipboard.implementation.name != "Clipboard::File"
 
     if CLIPBOARD_AVAILABLE
       GLOBAL_MAP.define_key("\M-w", :clipboard_copy_region)

data/lib/textbringer/commands/files.rb

@@ -143,5 +143,20 @@ module Textbringer
                                  File.dirname(Buffer.current.file_name))|
       FileUtils.mkdir_p(dir_name)
     end
+
+    define_command(:find_source, doc: "Open the source file.") do
+      |obj = read_object("Object or Class: ")|
+      klass = obj.is_a?(Module) ? obj : obj.class
+      method_name = klass.instance_methods(false).first
+      if method_name.nil?
+        raise EditorError, "Source not found"
+      end
+      method = klass.instance_method(method_name)
+      file_name = method.source_location.first
+      if !File.exist?(file_name)
+        raise EditorError, "Source not found"
+      end
+      find_file(method.source_location.first)
+    end
   end
 end

data/lib/textbringer/commands/help.rb

@@ -1,3 +1,6 @@
+$".push("readline.rb")
+require "rdoc/ri/driver"
+
 module Textbringer
   module Commands
     HELP_RING = Ring.new
@@ -38,7 +41,7 @@ module Textbringer
     define_command(:describe_bindings,
                    doc: "Display the key bindings.") do
       show_help do |help|
-        s = ""
+        s = +""
         if Controller.current.overriding_map
           s << "Overriding Bindings:\n"
           s << keymap_bindings(Controller.current.overriding_map)
@@ -102,6 +105,44 @@ module Textbringer
       push_help_command([:describe_key, key])
     end
 
+    define_command(:describe_class,
+                   doc: "Display the documentation of the class.") do
+      |name = read_expression("Describe class: ")|
+      show_help do |help|
+        old_stdout = $stdout
+        $stdout = StringIO.new
+        begin
+          rdoc = RDoc::RI::Driver.new(use_stdout: true,
+                                      formatter: RDoc::Markup::ToRdoc,
+                                      interactive: false)
+          rdoc.display_class(name)
+          help.insert($stdout.string)
+        ensure
+          $stdout = old_stdout
+        end
+      end
+      push_help_command([:describe_class, name])
+    end
+
+    define_command(:describe_method,
+                   doc: "Display the documentation of the method.") do
+      |name = read_expression("Describe method: ")|
+      show_help do |help|
+        old_stdout = $stdout
+        $stdout = StringIO.new
+        begin
+          rdoc = RDoc::RI::Driver.new(use_stdout: true,
+                                      formatter: RDoc::Markup::ToRdoc,
+                                      interactive: false)
+          rdoc.display_method(name)
+          help.insert($stdout.string)
+        ensure
+          $stdout = old_stdout
+        end
+      end
+      push_help_command([:describe_method, name])
+    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

@@ -32,7 +32,7 @@ module Textbringer
     end
 
     define_command(:eval_expression) do
-      |s = read_from_minibuffer("Eval: ")|
+      |s = read_expression("Eval: ")|
       result = eval(s, TOPLEVEL_BINDING, "(eval_expression)", 1)
       message(result.inspect)
       result
@@ -243,6 +243,9 @@ module Textbringer
         mark = yield(global_mark_ring)
       end
       if mark.detached?
+        unless mark.file_name
+          raise EditorError, "The buffer has gone"
+        end
         find_file(mark.file_name)
         goto_char(mark.location)
       else

data/lib/textbringer/default_output.rb

@@ -0,0 +1,18 @@
+require "stringio"
+
+module Textbringer
+  class DefaultOutput
+    def write(*args)
+      Buffer.current.insert(args.join)
+    end
+
+    def flush
+    end
+
+    def method_missing(mid, ...)
+      buffer = StringIO.new
+      buffer.send(mid, ...)
+      write(buffer.string)
+    end
+  end
+end

data/lib/textbringer/input_methods/t_code_input_method.rb

@@ -57,7 +57,11 @@ module Textbringer
       end
       if key_index.nil?
         @prev_key_index = nil
-        return event
+        if event.is_a?(String) && /\A[A-Z]\z/.match?(event)
+          return event.downcase
+        else
+          return event
+        end
       end
       if @prev_key_index.nil?
         @prev_key_index = key_index

data/lib/textbringer/keymap.rb

@@ -153,6 +153,7 @@ module Textbringer
   GLOBAL_MAP.define_key(?\C-_, :undo)
   GLOBAL_MAP.define_key("\C-xu", :undo)
   GLOBAL_MAP.define_key("\C-x\C-_", :redo_command)
+  GLOBAL_MAP.define_key("\M-\C-_", :redo_command)
   GLOBAL_MAP.define_key("\C-t", :transpose_chars)
   GLOBAL_MAP.define_key("\C-j", :newline)
   GLOBAL_MAP.define_key("\C-m", :newline)
@@ -210,6 +211,8 @@ module Textbringer
   GLOBAL_MAP.define_key([:f1, "b"], :describe_bindings)
   GLOBAL_MAP.define_key([:f1, "f"], :describe_command)
   GLOBAL_MAP.define_key([:f1, "k"], :describe_key)
+  GLOBAL_MAP.define_key([:f1, "c"], :describe_class)
+  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.handle_undefined_key do |key|

data/lib/textbringer/modes/c_mode.rb

@@ -1,6 +1,6 @@
 module Textbringer
   CONFIG[:c_indent_level] = 4
-  CONFIG[:c_indent_tabs_mode] = true
+  CONFIG[:c_indent_tabs_mode] = false
   CONFIG[:c_continued_statement_offset] = 4
   CONFIG[:c_case_label_offset] = -4
   CONFIG[:c_label_offset] = -2
@@ -187,7 +187,7 @@ module Textbringer
         if text.empty?
           raise EditorError, "Empty token: (#{line},#{column}) #{$~.inspect}"
         end
-        tokens.push([[line, column], token_name, text])
+        tokens.push([[line, column], token_name, CANONICAL_PUNCTUATORS[text]])
         lf_count = text.count("\n")
         if lf_count > 0
           line += lf_count

data/lib/textbringer/utils.rb

@@ -1,4 +1,6 @@
 require "rbconfig"
+require "irb"
+require "irb/completion"
 
 module Textbringer
   module Utils
@@ -323,6 +325,31 @@ module Textbringer
       end
     end
 
+    if defined?(IRB::RegexpCompletor)
+      EXPRESSION_COMPLETOR = IRB::RegexpCompletor.new
+      EXPRESSION_COMPLETOR_OPTIONS = {
+        bind: TOPLEVEL_BINDING,
+        doc_namespace: false
+      }
+    else
+      EXPRESSION_COMPLETOR = IRB::InputCompletor
+      EXPRESSION_COMPLETOR_OPTIONS = {
+        bind: TOPLEVEL_BINDING
+      }
+    end
+
+    def read_expression(prompt = "Expression: ")
+      f = ->(s) {
+        EXPRESSION_COMPLETOR.retrieve_completion_data(s, **EXPRESSION_COMPLETOR_OPTIONS).compact
+      }
+      read_from_minibuffer(prompt, completion_proc: f)
+    end
+
+    def read_object(prompt = "Object: ")
+      s = read_expression(prompt)
+      eval(s)
+    end
+
     HOOKS = Hash.new { |h, k| h[k] = [] }
 
     def add_hook(name, func = nil, &block)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/lib/textbringer/window.rb

@@ -1,5 +1,4 @@
 require "curses"
-require "unicode/display_width"
 
 module Textbringer
   class Window

data/lib/textbringer.rb

@@ -38,3 +38,4 @@ 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"
+require_relative "textbringer/default_output"

data/textbringer.gemspec

@@ -19,8 +19,10 @@ 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.7'
+  spec.required_ruby_version = '>= 3.1'
 
+  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"

metadata

@@ -1,15 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nkf
+  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: drb
+  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: curses
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +211,7 @@ files:
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
+- README.ja.md
 - README.md
 - Rakefile
 - bin/console
@@ -212,6 +240,7 @@ files:
 - lib/textbringer/commands/windows.rb
 - lib/textbringer/config.rb
 - lib/textbringer/controller.rb
+- lib/textbringer/default_output.rb
 - lib/textbringer/errors.rb
 - lib/textbringer/face.rb
 - lib/textbringer/faces/basic.rb
@@ -243,7 +272,6 @@ homepage: https://github.com/shugo/textbringer
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -251,15 +279,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []