terminal_rb 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a718915d07704084ceeb6a395a4a40d97feb52c17048f8024b3493afb0d8a1c5
-  data.tar.gz: 252bb2965c7b5d33e58fb0752e1bb171cbe259de315494f5e547803554c843a7
+  metadata.gz: 76294a5517d1c24b4c85f855cf802ce01dd1fa574dfac92753edd78b7a8fd465
+  data.tar.gz: 3e95e7b5ae8f40a9e284cdd3abddbd5a77a70e0a4df40e0deed2702acaf2ed07
 SHA512:
-  metadata.gz: 9d006c4e463e3522b3e3c63bd343d2806cf4dd11bdaa6e9cf82b73ee7fe84d40296b9d919d3b0ea7664edca354e28e99302e0e01b87f04e5fa0dd5ccecd4a6b2
-  data.tar.gz: bb3a2b01dbd455bd66c2dbddcbd29dfca325d134b40b34b1de14168cb8c0c20be001f0bd20e78cd64f18a56bde7fe17a73673e7d7c249cb446cafeaef1c27f80
+  metadata.gz: 99e9e190caea636278031df7116ce0fdaf15fa6fdf2c6c1912906862341eae25e3b6aacc77296aca15b833e4548cbad36edf7f41160fc313059c6ecbe472fb2a
+  data.tar.gz: 0b5cbc5ef6ed87179d6b74663607bec29c07ad53ca4fc7c1593577214e31d5b08281fa68a119be361eb4ce720420767d09690b5679ee2f6e43ef3061c40b7ec7

data/README.md

@@ -4,7 +4,7 @@ Terminal.rb supports you with input and output on your terminal. Simple [BBCode]
 
 - Gem: [rubygems.org](https://rubygems.org/gems/terminal_rb)
 - Source: [codeberg.org](https://codeberg.org/mblumtritt/Terminal.rb)
-- Help: [rubydoc.info](https://rubydoc.info/gems/terminal_rb/0.18.0/Terminal)
+- Help: [rubydoc.info](https://rubydoc.info/gems/terminal_rb/0.19.0/Terminal)
 
 ## Features
 
@@ -70,7 +70,7 @@ You can install the gem in your system with
 gem install terminal_rb
 ```
 
-or you can use [Bundler](http://gembundler.com/) to add Terminal.rb to your own project:
+or you can use [Bundler](https://bundler.io) to add Terminal.rb to your own project:
 
 ```shell
 bundle add terminal_rb

data/bin/bbcode

@@ -42,5 +42,5 @@ rescue IOError, SystemCallError => e
   $stderr.puts "#{me}-error: #{e.message.gsub(/@ \w+ /, '')}"
   exit 1
 rescue Interrupt
-  exit 138
+  exit 130
 end

data/lib/terminal/text/char_width.rb

@@ -2,26 +2,37 @@
 
 module Terminal
   module Text
-    #
-    # Generated file; based on Unicode v17.0.0
+    # supported Unicode Standard version
+    UNICODE_VERSION = '17.0.0'
+
+    # Generated file
+    # based on https://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
     #
     module CharWidth
       def self.[](ord) = @width[@last.bsearch_index { ord <= _1 }]
 
       @last = [
+        0x5d,
+        0x5e,
+        0x5f,
+        0x60,
         0xa0,
         0xa1,
         0xa3,
         0xa4,
         0xa6,
+        0xa7,
         0xa8,
         0xa9,
         0xaa,
         0xac,
         0xae,
         0xaf,
+        0xb3,
         0xb4,
         0xb5,
+        0xb7,
+        0xb8,
         0xba,
         0xbb,
         0xbf,
@@ -99,8 +110,8 @@ module Terminal
         0x251,
         0x260,
         0x261,
-        0x2c3,
-        0x2c4,
+        0x2c1,
+        0x2c5,
         0x2c6,
         0x2c7,
         0x2c8,
@@ -109,14 +120,18 @@ module Terminal
         0x2cd,
         0x2cf,
         0x2d0,
-        0x2d7,
-        0x2db,
-        0x2dc,
-        0x2dd,
-        0x2de,
+        0x2d1,
         0x2df,
-        0x2ff,
+        0x2e4,
+        0x2eb,
+        0x2ec,
+        0x2ed,
+        0x2ee,
         0x36f,
+        0x374,
+        0x375,
+        0x383,
+        0x385,
         0x390,
         0x3a1,
         0x3a2,
@@ -143,20 +158,26 @@ module Terminal
         0x5c5,
         0x5c6,
         0x5c7,
+        0x5ff,
+        0x605,
         0x60f,
         0x61a,
+        0x61b,
+        0x61c,
         0x64a,
         0x65f,
         0x66f,
         0x670,
         0x6d5,
-        0x6dc,
+        0x6dd,
         0x6de,
         0x6e4,
         0x6e6,
         0x6e8,
         0x6e9,
         0x6ed,
+        0x70e,
+        0x70f,
         0x710,
         0x711,
         0x72f,
@@ -177,11 +198,13 @@ module Terminal
         0x82d,
         0x858,
         0x85b,
+        0x887,
+        0x888,
+        0x88f,
+        0x891,
         0x896,
         0x89f,
         0x8c9,
-        0x8e1,
-        0x8e2,
         0x902,
         0x939,
         0x93a,
@@ -359,7 +382,6 @@ module Terminal
         0x109d,
         0x10ff,
         0x115f,
-        0x11ff,
         0x135c,
         0x135f,
         0x1711,
@@ -381,8 +403,6 @@ module Terminal
         0x17dc,
         0x17dd,
         0x180a,
-        0x180d,
-        0x180e,
         0x180f,
         0x1884,
         0x1886,
@@ -464,6 +484,19 @@ module Terminal
         0x1cf9,
         0x1dbf,
         0x1dff,
+        0x1fbc,
+        0x1fbd,
+        0x1fbe,
+        0x1fc1,
+        0x1fcc,
+        0x1fcf,
+        0x1fdc,
+        0x1fdf,
+        0x1fec,
+        0x1fef,
+        0x1ffc,
+        0x1ffe,
+        0x200a,
         0x200f,
         0x2010,
         0x2012,
@@ -476,6 +509,8 @@ module Terminal
         0x2022,
         0x2023,
         0x2027,
+        0x2029,
+        0x202e,
         0x202f,
         0x2030,
         0x2031,
@@ -486,6 +521,10 @@ module Terminal
         0x203b,
         0x203d,
         0x203e,
+        0x205f,
+        0x2064,
+        0x2065,
+        0x206f,
         0x2073,
         0x2074,
         0x207e,
@@ -750,7 +789,7 @@ module Terminal
         0x3040,
         0x3096,
         0x3098,
-        0x309a,
+        0x309c,
         0x30ff,
         0x3104,
         0x312f,
@@ -774,6 +813,12 @@ module Terminal
         0xa69f,
         0xa6ef,
         0xa6f1,
+        0xa6ff,
+        0xa716,
+        0xa71f,
+        0xa721,
+        0xa788,
+        0xa78a,
         0xa801,
         0xa802,
         0xa805,
@@ -832,6 +877,10 @@ module Terminal
         0xaaed,
         0xaaf5,
         0xaaf6,
+        0xab5a,
+        0xab5b,
+        0xab69,
+        0xab6b,
         0xabe4,
         0xabe5,
         0xabe7,
@@ -840,15 +889,13 @@ module Terminal
         0xabed,
         0xabff,
         0xd7a3,
-        0xd7af,
-        0xd7c6,
-        0xd7ca,
-        0xd7fb,
         0xdfff,
         0xf8ff,
         0xfaff,
         0xfb1d,
         0xfb1e,
+        0xfbb1,
+        0xfbc2,
         0xfdff,
         0xfe0f,
         0xfe19,
@@ -859,10 +906,20 @@ module Terminal
         0xfe66,
         0xfe67,
         0xfe6b,
+        0xfefe,
+        0xfeff,
         0xff00,
+        0xff3d,
+        0xff3e,
+        0xff3f,
+        0xff40,
         0xff60,
         0xffdf,
+        0xffe2,
+        0xffe3,
         0xffe6,
+        0xfff8,
+        0xfffb,
         0xfffc,
         0xfffd,
         0x101fc,
@@ -909,8 +966,12 @@ module Terminal
         0x110b6,
         0x110b8,
         0x110ba,
+        0x110bc,
+        0x110bd,
         0x110c1,
         0x110c2,
+        0x110cc,
+        0x110cd,
         0x110ff,
         0x11102,
         0x11126,
@@ -1087,7 +1148,7 @@ module Terminal
         0x11f42,
         0x11f59,
         0x11f5a,
-        0x1343f,
+        0x1342f,
         0x13440,
         0x13446,
         0x13455,
@@ -1134,13 +1195,15 @@ module Terminal
         0x1b2fb,
         0x1bc9c,
         0x1bc9e,
+        0x1bc9f,
+        0x1bca3,
         0x1ceff,
         0x1cf2d,
         0x1cf2f,
         0x1cf46,
         0x1d166,
         0x1d169,
-        0x1d17a,
+        0x1d172,
         0x1d182,
         0x1d184,
         0x1d18b,
@@ -1214,7 +1277,7 @@ module Terminal
         0x1f190,
         0x1f19a,
         0x1f1ac,
-        0x1f1e5,
+        0x1f1ff,
         0x1f202,
         0x1f20f,
         0x1f23b,
@@ -1241,6 +1304,8 @@ module Terminal
         0x1f3f3,
         0x1f3f4,
         0x1f3f7,
+        0x1f3fa,
+        0x1f3ff,
         0x1f43e,
         0x1f43f,
         0x1f440,
@@ -1302,6 +1367,10 @@ module Terminal
         0x2fffd,
         0x2ffff,
         0x3fffd,
+        0xe0000,
+        0xe0001,
+        0xe001f,
+        0xe007f,
         0xe00ff,
         0xe01ef,
         0xeffff,
@@ -1313,24 +1382,26 @@ module Terminal
 
       @width = [
         1,
-        -1,
+        0,
         1,
-        -1,
+        0,
         1,
         -1,
         1,
         -1,
         1,
         -1,
+        0,
         1,
         -1,
         1,
         -1,
-        1,
+        0,
         -1,
+        0,
         1,
         -1,
-        1,
+        0,
         -1,
         1,
         -1,
@@ -1409,7 +1480,7 @@ module Terminal
         1,
         -1,
         1,
-        -1,
+        0,
         1,
         -1,
         1,
@@ -1421,6 +1492,16 @@ module Terminal
         1,
         0,
         1,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
         -1,
         1,
         -1,
@@ -1661,7 +1742,24 @@ module Terminal
         1,
         0,
         1,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
         2,
+        1,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
         0,
         1,
         0,
@@ -1768,6 +1866,7 @@ module Terminal
         1,
         0,
         1,
+        0,
         -1,
         1,
         -1,
@@ -1780,6 +1879,8 @@ module Terminal
         1,
         -1,
         1,
+        0,
+        1,
         -1,
         1,
         -1,
@@ -1790,6 +1891,10 @@ module Terminal
         1,
         -1,
         1,
+        0,
+        1,
+        0,
+        1,
         -1,
         1,
         -1,
@@ -2098,12 +2203,14 @@ module Terminal
         1,
         0,
         1,
-        2,
+        0,
         1,
         0,
         1,
         0,
         1,
+        2,
+        1,
         0,
         1,
         0,
@@ -2142,18 +2249,24 @@ module Terminal
         1,
         0,
         1,
-        2,
+        0,
         1,
         0,
         1,
         0,
         1,
+        0,
+        1,
+        2,
+        1,
         -1,
         2,
         1,
         0,
         1,
         0,
+        1,
+        0,
         2,
         1,
         0,
@@ -2163,9 +2276,19 @@ module Terminal
         1,
         2,
         1,
+        0,
+        1,
+        2,
+        0,
+        2,
+        0,
         2,
         1,
         2,
+        0,
+        2,
+        1,
+        0,
         1,
         -1,
         1,
@@ -2407,6 +2530,10 @@ module Terminal
         1,
         0,
         1,
+        0,
+        1,
+        0,
+        1,
         2,
         0,
         1,
@@ -2452,6 +2579,8 @@ module Terminal
         1,
         0,
         1,
+        0,
+        1,
         2,
         1,
         2,
@@ -2545,6 +2674,8 @@ module Terminal
         2,
         1,
         2,
+        0,
+        2,
         1,
         2,
         1,
@@ -2608,6 +2739,10 @@ module Terminal
         1,
         0,
         1,
+        0,
+        1,
+        0,
+        1,
         -1,
         1,
         -1,

data/lib/terminal/text.rb

@@ -108,18 +108,39 @@ module Terminal
       end
       alias each_with_size each_line_with_size
 
+      # Returns maximal width of a line of given text.
+      #
+      # @param (see each_line)
+      # @return [Integer] width
+      def max_line_width(*text, ignore_newline: false)
+        return 0 if text.empty?
+        ret = 0
+        pairs(as_snippets(text, false, false, ignore_newline, Word)) do |_l, w|
+          ret = w if w > ret
+        end
+        ret
+      end
+
       private
 
       def char_width(char)
         ord = char.ord
-        return @ctrlchar_width[ord] || 2 if ord < 0x20
-        return 1 if char.size < 2 && ord < 0xa1
-        width = CharWidth[ord]
-        return @ambiguous_char_width if width == -1
-        sco = char[-1].ord
-        return width if sco != 0xff9e && sco != 0xff9f
-        # handle halfwidth dakuten/handakuten
-        char.size < 2 ? 1 : char.each_char.sum { char_width(_1) }
+        return @ctrlchar_width[ord] if ord < 0x20
+        if char.size == 1
+          return 1 if ord < 0xa1
+          width = CharWidth[ord]
+          return width < 0 ? @ambiguous_char_width : width
+        end
+        sum = 0
+        zwj = false
+        char.each_char do |c|
+          next zwj = false if zwj
+          ord = c.ord
+          next zwj = true if ord == 0x200d # zero with joiner
+          width = CharWidth[ord]
+          sum += (width < 0 ? @ambiguous_char_width : width)
+        end
+        sum
       end
 
       def lim_pairs(snippets, limit)
@@ -153,8 +174,8 @@ module Terminal
             next csi = nil
           end
 
-          next line << (csi = snippet) if snippet.is_a?(Csi)
-          next line << snippet if snippet.is_a?(Osc)
+          next line << (csi = snippet) if Csi === snippet
+          next line << snippet if Osc === snippet
 
           # Word:
 
@@ -217,12 +238,12 @@ module Terminal
             next csi = nil
           end
 
-          next line << (csi = snippet) if snippet.is_a?(Csi)
-          next line << snippet if snippet.is_a?(Osc)
+          next line << (csi = snippet) if Csi === snippet
+          next line << snippet if Osc === snippet
 
           # Word:
-          line << snippet
           size += snippet.size
+          line << snippet
         end
         nil
       end
@@ -258,8 +279,8 @@ module Terminal
             next csi = nil
           end
 
-          next line << (csi = snippet) if snippet.is_a?(Csi)
-          next line << snippet if snippet.is_a?(Osc)
+          next line << (csi = snippet) if Csi === snippet
+          next line << snippet if Osc === snippet
 
           # Word:
 
@@ -322,12 +343,12 @@ module Terminal
             next csi = nil
           end
 
-          next line << (csi = snippet) if snippet.is_a?(Csi)
-          next line << snippet if snippet.is_a?(Osc)
+          next line << (csi = snippet) if Csi === snippet
+          next line << snippet if Osc === snippet
 
           # Word:
-          line << snippet
           size += snippet.size
+          line << snippet
         end
         nil
       end
@@ -335,9 +356,10 @@ module Terminal
       def as_snippets(text, bbcode, ansi, ignore_newline, word_class)
         ret = []
         last = nil
+        to_s = bbcode ? ->(s) { Ansi.bbcode(s) } : :to_s.to_proc
         text.each do |txt|
-          if (txt = bbcode ? Ansi.bbcode(txt) : txt.to_s).empty?
-            next ret[-1] = last = :hard_nl if last.is_a?(Symbol)
+          if (txt = to_s[txt]).empty?
+            next ret[-1] = last = :hard_nl if Symbol === last
             next ret << (last = :hard_nl)
           end
 
@@ -345,15 +367,15 @@ module Terminal
 
           txt.scan(@scan_snippet) do |nl, csi, osc, space, gc|
             if gc
-              next last.add(gc, char_width(gc)) if last.is_a?(word_class)
+              next last.add(gc, char_width(gc)) if word_class === last
               next ret << (last = word_class.new(gc, char_width(gc)))
             end
 
-            next last.is_a?(Symbol) ? nil : ret << (last = :space) if space
+            next Symbol === last ? nil : ret << (last = :space) if space
 
             if nl
               if ignore_newline # handle nl like space
-                next last.is_a?(Symbol) ? nil : ret << (last = :space)
+                next Symbol === last ? nil : ret << (last = :space)
               end
               next last == :space ? ret[-1] = last = :nl : ret << (last = :nl)
             end
@@ -366,11 +388,10 @@ module Terminal
               next last == CsiEnd ? nil : ret << (last = CsiEnd)
             end
 
-            last.is_a?(Csi) ? last.add(csi) : ret << (last = Csi.new(csi))
+            Csi === last ? last.add(csi) : ret << (last = Csi.new(csi))
           end
 
-          next ret[-1] = last = :hard_nl if last.is_a?(Symbol)
-          ret << (last = :hard_nl)
+          Symbol === last ? ret[-1] = last = :hard_nl : ret << (last = :hard_nl)
         end
         ret
       end
@@ -378,9 +399,7 @@ module Terminal
 
     class Osc
       attr_reader :to_str, :size
-      alias _to_s to_s
       alias to_s to_str
-      def inspect = "#{_to_s.chop} #{@to_str.inspect}>"
 
       def initialize(str)
         @to_str = str
@@ -402,9 +421,7 @@ module Terminal
 
     class Word
       attr_reader :to_str, :size
-      alias _to_s to_s
       alias to_s to_str
-      def inspect = "#{_to_s.chop} #{@size}:#{@to_str.inspect}>"
 
       def initialize(char, size)
         @to_str = char.dup
@@ -461,42 +478,49 @@ module Terminal
         | (\X)
       )/x
 
-    @ctrlchar_width = {
-      0x00 => 0,
-      0x01 => 1,
-      0x02 => 1,
-      0x03 => 1,
-      0x04 => 1,
-      0x05 => 0,
-      0x06 => 1,
-      0x07 => 0,
-      0x08 => 0,
-      0x09 => 8,
-      0x0a => 0,
-      0x0b => 0,
-      0x0c => 0,
-      0x0d => 0,
-      0x0e => 0,
-      0x0f => 0,
-      0x10 => 1,
-      0x11 => 1,
-      0x12 => 1,
-      0x13 => 1,
-      0x14 => 1,
-      0x15 => 1,
-      0x16 => 1,
-      0x17 => 1,
-      0x18 => 1,
-      0x19 => 1,
-      0x1a => 1,
-      0x1b => 1,
-      0x1c => 1,
-      0x1d => 1,
-      0x1e => 1,
-      0x1f => 1
-    }.compare_by_identity.freeze
-
-    autoload :CharWidth, "#{__dir__}/text/char_width.rb"
+    @ctrlchar_width =
+      Hash
+        .new(2)
+        .compare_by_identity
+        .merge!(
+          0x00 => 0,
+          0x01 => 1,
+          0x02 => 1,
+          0x03 => 1,
+          0x04 => 1,
+          0x05 => 0,
+          0x06 => 1,
+          0x07 => 0,
+          0x08 => 0,
+          0x09 => 8,
+          0x0a => 0,
+          0x0b => 0,
+          0x0c => 0,
+          0x0d => 0,
+          0x0e => 0,
+          0x0f => 0,
+          0x10 => 1,
+          0x11 => 1,
+          0x12 => 1,
+          0x13 => 1,
+          0x14 => 1,
+          0x15 => 1,
+          0x16 => 1,
+          0x17 => 1,
+          0x18 => 1,
+          0x19 => 1,
+          0x1a => 1,
+          0x1b => 1,
+          0x1c => 1,
+          0x1d => 1,
+          0x1e => 1,
+          0x1f => 1
+        )
+        .freeze
+
+    cw_file = "#{__dir__}/text/char_width.rb"
+    autoload :CharWidth, cw_file
+    autoload :UNICODE_VERSION, cw_file
 
     private_constant :Osc, :Csi, :CsiEnd, :Word, :WordEx, :CharWidth
   end

data/lib/terminal/version.rb

@@ -2,5 +2,5 @@
 
 module Terminal
   # The version number of the gem.
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal_rb
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -55,7 +55,7 @@ licenses:
 metadata:
   source_code_uri: https://codeberg.org/mblumtritt/Terminal.rb
   bug_tracker_uri: https://codeberg.org/mblumtritt/Terminal.rb/issues
-  documentation_uri: https://rubydoc.info/gems/terminal_rb/0.18.0
+  documentation_uri: https://rubydoc.info/gems/terminal_rb/0.19.0
   rubygems_mfa_required: 'true'
   yard.run: yard
 rdoc_options: []
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Fast terminal access with ANSI, CSIu, mouse events, BBCode, word-wise line
   break support and much more.