mdless 2.0.19 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094b8ac8273e025bee23c350cc7aee02682b2445d22523d216b4e621d067ff9b'
-  data.tar.gz: 495dc941df5b4235c9bb5d7cccb37739e1cc783679d276d026d36a7a9dafc937
+  metadata.gz: 24d135c2a8c4e8591a7751cea47743a88c2c727f7f589200ea8c4058f3c60dca
+  data.tar.gz: 1ae18541f3fe42b5bea17fddf6a3f6865119c74a3ad71c103b25012adeffaf67
 SHA512:
-  metadata.gz: f15d9fc92d6286708adc3060dfbc265a4064419eceecb25dfe4de3f7d60e1f033f7e2f157a34ef2940130ca1caea565e9fe43a2f5cab5f611c8f0d864830f54b
-  data.tar.gz: 9db7cd9e9914bd37bc1a97362e27ef169d899f89fcae0e2e8004da3bd48cffe539518e61396e0f325953a5008adbbb8b37debcbabffdce1d08268a7b73b27f2c
+  metadata.gz: f719c51af95220cc95fe0d3ceb8ecd7669e039c08133d5306d8882c6ee8756e4afabc988fbce455b50aa8293f04c1bf396240922ceaa0bbe7152495ce67c0866
+  data.tar.gz: 00ca7d0cdc6c5b20651ad7d0e26f0b2d40630173036dda68247b9fc11f884f788522ccd5a029b6a8c661a549ae2589463d4df552fa3da72ac1d28dc279bf284c

data/lib/mdless/console.rb

@@ -229,7 +229,11 @@ module Redcarpet
       end
 
       def paragraph(text)
-        "#{xc}#{text}#{xc}#{x}\n\n"
+        if MDLess.options[:preserve_linebreaks]
+          "#{xc}#{text.gsub(/ +/, ' ').strip}#{xc}#{x}\n\n"
+        else
+          "#{xc}#{text.gsub(/ +/, ' ').gsub(/\n+/, ' ').strip}#{xc}#{x}\n\n"
+        end
       end
 
       @table_cols = nil
@@ -250,6 +254,7 @@ module Redcarpet
       end
 
       def table(header, body)
+        @header_row = []
         formatted = CLIMarkdown::MDTableCleanup.new([
           "#{header}",
           table_header_row,
@@ -257,7 +262,7 @@ module Redcarpet
           "#{body}\n\n"
         ].join(''))
         res = formatted.to_md
-        "#{color_table(res)}\n"
+        "#{color_table(res)}\n\n"
         # res
       end
 
@@ -426,7 +431,7 @@ module Redcarpet
       end
 
       def link(link, title, content)
-        res = color_link(link, title, content)
+        res = color_link(link, title&.strip, content&.strip)
         @@links << {
           link: res,
           url: link,
@@ -580,7 +585,7 @@ module Redcarpet
           end.join("\n"), indent)
           next if list.nil?
 
-          "<<main#{m['id']}>>#{list}<</main#{m['id']}>>"
+          "<<main#{m['id']}>>#{list}<</main#{m['id']}>>\n\n"
         end
 
         input.gsub(/^(?<indent> +)<<main(?<id>\d+)>>(?<content>.*?)<<\/main\k<id>>>/m) do
@@ -785,11 +790,11 @@ module Redcarpet
           links_added = false
 
           @@links.each do |link|
-            if graf =~ /#{Regexp.escape(link[:link])}/
+            if graf =~ /#{Regexp.escape(link[:link].gsub(/\n/, ' '))}/
               url = link[:url].uncolor
               content = link[:content]
               title = link[:title]&.uncolor
-              graf.gsub!(/#{Regexp.escape(link[:link])}/, color_link_reference(url, counter, content))
+              graf.gsub!(/#{Regexp.escape(link[:link].gsub(/\n/, ' '))}/, color_link_reference(url, counter, content))
               if MDLess.options[:links] == :paragraph
                 if links_added
                   graf += "\n#{color_reference_link(url, title, counter)}"

data/lib/mdless/converter.rb

@@ -156,9 +156,14 @@ module CLIMarkdown
                              end
         end
 
+        default(:preserve_linebreaks, false)
+        opts.on('--[no-]linebreaks', 'Preserve line breaks') do |opt|
+          MDLess.options[:preserve_linebreaks] = opt
+        end
+
         default(:syntax_higlight, false)
-        opts.on('--[no-]syntax', 'Syntax highlight code blocks') do |p|
-          MDLess.options[:syntax_higlight] = p
+        opts.on('--[no-]syntax', 'Syntax highlight code blocks') do |opt|
+          MDLess.options[:syntax_higlight] = opt
         end
 
         MDLess.options[:taskpaper] = if MDLess.options[:taskpaper]

data/lib/mdless/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.0.19
+  version: 2.0.21
 platform: ruby
 authors:
 - Brett Terpstra