mdless 2.0.20 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4af619d93405da0eb2861158c261c7cd2c494530f32c3e5de2a8be9b4c7d713
-  data.tar.gz: 17c466f16b258b5959be6ac0f2540594a36b3319007692897200999749c34cc1
+  metadata.gz: 7000551956e5384e5c516ac84ce7f709a822e668483b6b921c51af8835928174
+  data.tar.gz: f5954f572cd89adcf03f2c09dff5721eb143b463cea043249e564792a035c381
 SHA512:
-  metadata.gz: 36f0963f1629e9cf7f65576c6340dc1bd1fd2ee8e2f47ccf9cde5852581db3a502804e571b28b3501f1a3dc9b29ea0c214eb504b9771c89bed27fd6ce9147377
-  data.tar.gz: d39dcf70ca3b26573f9459489b4ca3aafaa9f3d014d83d63aa76e0d4dbe37138a8c25b421b9b00457d9c6ab105b8fdbd3cf6fb85f6549d4963ae72694bc6e4ab
+  metadata.gz: b047fc7a13a8b3686f6ed5d4e6e0dce551bf63cfab04430e546b47aa1eeb0b60d8c8463988d2741ccfb833020a8afaec082cee04995185e1de75ad67a731640b
+  data.tar.gz: a61fed5f455b428044a17b118e78260377bc5fc7bb9b5292e6718ffbb0c847cce6a26d5e1e0f21c854ea905cc100167cd24ed0060e7256b540bf25aa248aaaca

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
@@ -427,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,
@@ -581,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
@@ -786,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.20'
+  VERSION = '2.0.22'
 end

metadata

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