mdless 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f08302d14bfa27b06fd821e56f46b6a04049009df87ab024c368e7776209810
-  data.tar.gz: c14bd96efedeaa61eba790a1f2e2664df39f85839ad914ffccfe323ef3312ee5
+  metadata.gz: 7b6335a8f0eb1e43af37924810a1e8e6b94f5b2da35b745824f3ce735536777d
+  data.tar.gz: 54643d669cfef096d92405e4b1ed2a216c749a67c3fb2f03dc32ad91e7a5f98a
 SHA512:
-  metadata.gz: 633007f423725e003e3c7154262801738bf22b79485d09b99caf06a83486fdca50a0e8b91f7d9a4118dd43c2bd0404cccc31a55486a8db00500e82a95007edeb
-  data.tar.gz: 870af2c74618556db8a6621016f9cc603f424956adda3441f0e8043f661bb2fac22b7c6f0e1aaa655570b0d7234e2d6e12c625d5a8af89599f2061db42e622ec
+  metadata.gz: 8a3d3fc7ee471da0cd3b882deba060a19728492a2493c06cca461029ce7d664940e8e0f602a324c71ede7d8e0b617365e7375cb4702cd7b19a91d440fda32a24
+  data.tar.gz: be3fc65aca571dcc96af250f8bc0faf0e5c8be3a7ed1a2b30229fd5fd501e6087a8990bcc43f5d8f60b21599167833f55381a759a54e7765a3be4db729e16de4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+2.1.9
+: Code block prefix configurable, can be left empty to make more copyable code blocks
+: Remove empty lines from block quotes
+: Infinite loop when calculating ANSI emphasis
+: Don't accept colors or semicolons inside of @tag names
+
 2.1.8
 : --update-theme option to add any missing keys to your theme file
 : Strip ul_char of any spaces before inserting

data/lib/mdless/colors.rb

@@ -92,6 +92,7 @@ module CLIMarkdown
           bg = nil
           rgbb = c
         else
+          em = []
           c.split(/;/).each do |i|
             x = i.to_i
             if x <= 9
@@ -113,10 +114,13 @@ module CLIMarkdown
         end
       end
 
-      escape = "\e[#{em.join(';')}m"
+      escape = ''
+      escape += "\e[#{em.join(';')}m" unless em.empty?
       escape += "\e[#{rgbb}m" if rgbb
       escape += "\e[#{rgbf}m" if rgbf
-      escape + "\e[#{[fg, bg].delete_if(&:nil?).join(';')}m"
+      fg_bg = [fg, bg].delete_if(&:nil?).join(';')
+      escape += "\e[#{fg_bg}m" unless fg_bg.empty?
+      escape
     end
 
     def blackout(bgcolor)
@@ -133,25 +137,23 @@ module CLIMarkdown
       self.uncolor.size
     end
 
-    def wrap(width=78,foreground=:x)
-      if self.uncolor =~ /(^([%~] |\s*>)| +[=\-]{5,})/
-        return self
-      end
+    def wrap(width=78, foreground=:x)
+      return self if uncolor =~ /(^([%~] |\s*>)| +[=-]{5,})/
 
       visible_width = 0
       lines = []
       line = ''
       last_ansi = ''
 
-      line += self.match(/^\s*/)[0].gsub(/\t/,'    ')
-      input = self.dup # .gsub(/(\w-)(\w)/,'\1 \2')
+      line += match(/^\s*/)[0].gsub(/\t/, '    ')
+      input = dup # .gsub(/(\w-)(\w)/,'\1 \2')
       # input.gsub!(/\[.*?\]\(.*?\)/) do |link|
       #   link.gsub(/ /, "\u00A0")
       # end
       input.split(/\s+/).each do |word|
-        last_ansi = line.scan(/\e\[[\d;]+m/)[-1] || ''
+        last_ansi = line.last_color_code
         if visible_width + word.size_clean >= width
-          lines << line + xc(foreground)
+          lines << line + xc
           visible_width = word.size_clean
           line = last_ansi + word
         elsif line.empty?
@@ -162,7 +164,7 @@ module CLIMarkdown
           line << ' ' << last_ansi + word
         end
       end
-      lines << line + match(/\s*$/)[0] + xc(foreground) if line
+      lines << line + match(/\s*$/)[0] + xc if line
       lines.map!.with_index do |l, i|
         (i.positive? ? l[i - 1].last_color_code : '') + l
       end

data/lib/mdless/console.rb

@@ -97,8 +97,8 @@ module Redcarpet
               hilite = xc + hilite.split(/\n/).map do |l|
                 [
                   color('code_block marker'),
-                  '> ',
-                  "#{color('code_block bg')}#{l.strip}#{xc}"
+                  MDLess.theme['code_block']['character'],
+                  "#{color('code_block bg')}#{l.rstrip}#{xc}"
                 ].join
               end.join("\n").blackout(MDLess.theme['code_block']['bg']) + "#{xc}\n"
             end
@@ -110,7 +110,7 @@ module Redcarpet
           hilite = code_block.split(/\n/).map do |line|
             [
               color('code_block marker'),
-              '> ',
+              MDLess.theme['code_block']['character'],
               color('code_block color'),
               line,
               xc
@@ -172,7 +172,7 @@ module Redcarpet
 
       def block_quote(quote)
         ret = "\n\n"
-        quote.wrap(MDLess.cols, color('blockquote color')).split(/\n/).each do |line|
+        quote.strip.wrap(MDLess.cols, color('blockquote color')).split(/\n/).each do |line|
           ret += [
             color('blockquote marker color'),
             MDLess.theme['blockquote']['marker']['character'],
@@ -941,7 +941,7 @@ module Redcarpet
       def highlight_tags(input)
         tag_color = color('at_tags tag')
         value_color = color('at_tags value')
-        input.gsub(/(?<pre>\s|m)(?<tag>@[^ \].?!,("']+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
+        input.gsub(/(?<pre>\s|m)(?<tag>@[^ \]:;.?!,("'\n]+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
           m = Regexp.last_match
           last_color = m.pre_match.last_color_code
           [

data/lib/mdless/string.rb

@@ -107,7 +107,7 @@ class ::String
     log = MDLess.log
     tag_color = color('at_tags tag')
     value_color = color('at_tags value')
-    gsub(/(?<pre>\s|m)(?<tag>@[^ \].?!,("'\n]+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
+    gsub(/(?<pre>\s|m)(?<tag>@[^ \]:;.?!,("'\n]+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?(?=[ ;!,.?]|$)/) do
       m = Regexp.last_match
       last_color = m.pre_match.last_color_code
       [

data/lib/mdless/theme.rb

@@ -66,6 +66,7 @@ module CLIMarkdown
       },
       'code_block' => {
         'marker' => 'intense_black',
+        'character' => '>',
         'bg' => 'on_black',
         'color' => 'white on_black',
         'border' => 'blue',

data/lib/mdless/version.rb

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

metadata

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