rubytui 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3422d29230acde2c0e9da429cf3ddf83a355706183039778574e3e3d9b5875b9
-  data.tar.gz: '059ab8b520b2d61ca15a0ba129b211ea4c44a52cb4dd826e5401172bb8ed9c1c'
+  metadata.gz: 1c02474959ea48e1132fe6eb9d4928bfd903380165103601f7af0f4de781fcd2
+  data.tar.gz: b341e4db0fe3e8804415b3436418b9289882bece33a49a6912499854e286c58d
 SHA512:
-  metadata.gz: 388a89d892b0f28d9ebbd9e0dd57f9dea31a65bca3d1d9da2f7af2c446fd9ddaddf05cc1d6cc5e3364860dd80225137573272230bf9dbed727c1edb075f750ae
-  data.tar.gz: 3c74612dc4bd6540af8b37cfdbec084ce5b6c292c9e2a64f9256b41ced9bca5855685930840adf199525a45de2b753a8b9bd099cf6ba0b26528db239de3c59e9
+  metadata.gz: e7c0955376bb8cce509abcb7d17caf24d18b94c1e72931ace799d36307290a1432786cc4428a89163c6482b14cfdc3b7a07833ad9a5783fb33b16040c0af9cf7
+  data.tar.gz: 2ceee4bcd1442108229131a7fbd5d5f36a8617185224e67bc4ac6393d59608003edbd873a6daaf904d4b1af3449fc46aab2d96cc19ba8981dc1e9f5c68eadb02

data/lib/rubytui/backends/ansi_backend.rb

@@ -390,18 +390,19 @@ module RubyTUI
         codes << (style.bg ? style.bg.to_bg_ansi : "49")
       end
 
-      # Modifiers added
+      # Modifiers removed, before any are added: SGR 22 turns off both bold
+      # and dim, so it must not follow a 1 or 2 meant to stay on
+      removed = prev.modifiers & ~style.modifiers
+      off = Modifier::SGR_OFF.filter_map { |flag, code| code if Modifier.contains?(removed, flag) }.uniq
+      codes.concat(off)
+
+      # Modifiers added, plus any bold/dim the new style keeps that 22 cleared
       added = style.modifiers & ~prev.modifiers
+      added |= style.modifiers & (Modifier::BOLD | Modifier::DIM) if off.include?("22")
       Modifier::SGR_ON.each do |flag, code|
         codes << code if Modifier.contains?(added, flag)
       end
 
-      # Modifiers removed
-      removed = prev.modifiers & ~style.modifiers
-      Modifier::SGR_OFF.each do |flag, code|
-        codes << code if Modifier.contains?(removed, flag)
-      end
-
       @buffer << "#{CSI}#{codes.join(";")}m" unless codes.empty?
       @prev_style = style
     end

data/lib/rubytui/version.rb

@@ -2,5 +2,5 @@
 
 module RubyTUI
   # Gem version string.
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytui
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - CoCL