mdless 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b310c064653d3fce972b3c3e91a134b9549d7595787ed9bd57efb8486780cbc5
-  data.tar.gz: 5379beea590a35d1a9fa8b034d008d3552d07b6fc1e3f56592ee9e38ae5a1b8d
+  metadata.gz: 3a7d200fbf2d90da97cf6ae65beecac52643ec377d2a60f7d8503ca2411694ea
+  data.tar.gz: f35b88bdf439f3436ddf2e6cf0b835e8a23d5d5553721b0c35d75954af43013e
 SHA512:
-  metadata.gz: 42cbc5c4366b3a7914f07409fcaf322741d3def2f23c578b956d1cad4683b905e9b02af7523bfd68988627feaaa314c6c772ada0f56b2b99b493838ec319a547
-  data.tar.gz: 15615f5222dae1e812a9cf252b7ba730a11ad06e19aac9397236768a4d396cd57ea307da0a0678ab5f2e3f5ceeea2b6f02a8de628b2cf168099165b8af787c72
+  metadata.gz: 906870b0032f1cba0a1c90be6ac2cb80f82c1abcb331470f75b02598d05d965996b2d2eb0a076b2651e32e9ae567334b693a9dffd702b517e15c5b8048f2e172
+  data.tar.gz: e1874c241362b44607a357ec4e125bdc463ae3b3ab906bdf7237e1b782a6122b6f90d664210cf7dd1b964bf843adb1056adbacdd93b816f0bb31db4d92ad1cf5

data/CHANGELOG.md

@@ -1,14 +1,9 @@
-2.1.6
-: In addition to color names, you can now use 3 or 6-digit hex codes, prefix with "bg" or "on_" to affect background color
-: Better highlighting of h1/h2 when header contains a link
-: List items with multiple paragraphs incorrectly highlighted
+2.1.7
+: Dedup and remove empty escape codes before output
+: Tables losing column alignment
+: Unneccessarily long table cells
 
-2.1.5
-: In addition to color names, you can now use 3 or 6-digit hex codes, prefix with "bg" or "on_" to affect background color
-: Better highlighting of h1/h2 when header contains a link
-: List items with multiple paragraphs incorrectly highlighted
-
-2.1.4
+2.1.6
 : In addition to color names, you can now use 3 or 6-digit hex codes, prefix with "bg" or "on_" to affect background color
 : Better highlighting of h1/h2 when header contains a link
 : List items with multiple paragraphs incorrectly highlighted

data/lib/mdless/colors.rb

@@ -58,6 +58,10 @@ module CLIMarkdown
       self.unpad.gsub(/\e\[[\d;]+m/,'')
     end
 
+    def remove_pre_post
+      gsub(/<<(pre|post)\d+>>/, '')
+    end
+
     def unpad
       self.gsub(/\u00A0/, ' ')
     end
@@ -155,10 +159,13 @@ module CLIMarkdown
           line = last_ansi + word
         else
           visible_width += word.size_clean + 1
-          line << " " << last_ansi + word
+          line << ' ' << last_ansi + word
         end
       end
       lines << line + match(/\s*$/)[0] + xc(foreground) if line
+      lines.map!.with_index do |l, i|
+        (i.positive? ? l[i - 1].last_color_code : '') + l
+      end
       lines.join("\n").gsub(/\[.*?\]\(.*?\)/) do |link|
         link.gsub(/\u00A0/, ' ')
       end

data/lib/mdless/console.rb

@@ -263,13 +263,13 @@ module Redcarpet
       end
 
       def table(header, body)
-        @header_row = []
         formatted = CLIMarkdown::MDTableCleanup.new([
           "#{header}",
           table_header_row,
           "|\n",
           "#{body}\n\n"
         ].join(''))
+        @header_row = []
         res = formatted.to_md
         "#{color_table(res)}\n\n"
         # res
@@ -555,7 +555,8 @@ module Redcarpet
           [
             indent,
             color('list bullet'),
-            "* ",
+            MDLess.theme['list']['ul_char'],
+            ' ',
             color('list color'),
             indent_lines(content, indent).strip,
             xc

data/lib/mdless/converter.rb

@@ -460,6 +460,20 @@ module CLIMarkdown
       input
     end
 
+    def clean_escapes(input)
+      out = input.gsub(/\e\[m/, '')
+      last_escape = ''
+      out.gsub!(/\e\[(?:(?:(?:[349]|10)[0-9]|[0-9])?;?)+m/) do |m|
+        if m == last_escape
+          ''
+        else
+          last_escape = m
+          m
+        end
+      end
+      out.gsub(/\e\[0m/, '')
+    end
+
     def update_inline_links(input)
       links = {}
       counter = 1
@@ -544,6 +558,7 @@ module CLIMarkdown
       end
 
       out = clean_markers(out)
+      out = clean_escapes(out)
       out = "#{out.gsub(/\n{2,}/m, "\n\n")}#{xc}"
 
       out.uncolor! unless MDLess.options[:color]

data/lib/mdless/tables.rb

@@ -72,7 +72,7 @@ module CLIMarkdown
 
       table.each do |row|
         @format_row.each_with_index do |_, i|
-          length = row[i].strip.length
+          length = row[i].uncolor.remove_pre_post.strip.length
           @widths[i] = length if length > @widths[i]
         end
       end

data/lib/mdless/theme.rb

@@ -48,6 +48,7 @@ module CLIMarkdown
         'url' => 'u yellow'
       },
       'list' => {
+        'ul_char' => '*',
         'bullet' => 'b intense_red',
         'number' => 'b intense_blue',
         'color' => 'intense_white'

data/lib/mdless/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CLIMarkdown
-  VERSION = '2.1.6'
+  VERSION = '2.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet