mdless 2.1.41 → 2.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1a73a6f53b1069e90cb3c9760f7ec30fa49c7b0bc6583278d85059cadc6558b
-  data.tar.gz: 934c7ce94e399d4f91bb3c2a6fb53053e3584ff9efba64d83e2e1c2b30430657
+  metadata.gz: b68decdfe8cb1115818810e9ead795533e1bc961059b43531b659a85e6144b24
+  data.tar.gz: b7a4cf80d2107af5a233c414e0ef90f67ff26a59563796c2956b2e541854f7f9
 SHA512:
-  metadata.gz: 52641ae7aa9bb96488c43df3793eaafd32c21d36e77695ebe5c9aebb085a2b241ffae9a7d1faa1cef40184b3f49e6da0c795ae36176eafe4c24f0339504a1d42
-  data.tar.gz: 44316ff110310cc9f026d6f21782b64f301e7a3cca99d9171fe34dc2ea2725e6731feafeee39d5cbac98ff782ba4e3548ee91810aaa33e5955a8e7fe46e2ee03
+  metadata.gz: 803a7b524eb3415d4490c24d6f1c6bbb5c7f56cc16eb87b85537ca20d5253ba4b92c3e19cce18e39cfc9c057e5bcdaa97c5797af76d3b285c7c7a7947decb32d
+  data.tar.gz: f37f47de66de5549509b14d62e7e8fe8056d2117b0bf48a570b979426f5cd8faf40497391b2bf72affbd62ae061f83d9f9bb97c7b05c9c14a49f5a221cb88dc4

data/lib/mdless/console.rb

@@ -582,7 +582,7 @@ module Redcarpet
           notes = line.to_enum(:scan, /\[\^(?<ref>\d+)\]/).map { Regexp.last_match }
           if notes.count.positive?
             footnotes = notes.map { |n| color_footnote_def(n['ref'].to_i) }.join("\n")
-            "#{line}\n\n#{footnotes}\n\n"
+            "#{line}\n\n#{footnotes}\n\n\n"
           else
             line
           end
@@ -604,14 +604,12 @@ module Redcarpet
         end
       end
 
-      def indent_lines(input, spaces)
+      def indent_lines(input)
         return nil if input.nil?
 
-        indent = spaces.scan(/ /).count
-
         lines = input.split(/\n/)
         line1 = lines.shift
-        pre = spaces + "  "
+        pre = ' '
 
         body = lines.map { |l| "#{pre}#{l.rstrip}" }.join("\n")
         "#{line1}\n#{body}"
@@ -621,21 +619,21 @@ module Redcarpet
         out = case type
               when :unordered
                 [
-                  indent,
+                  ' ' * indent,
                   color('list bullet'),
                   MDLess.theme['list']['ul_char'].strip,
                   ' ',
                   color('list color'),
-                  indent_lines(content, indent).strip,
+                  indent_lines(content).strip,
                   xc
                 ].join
               when :ordered
                 [
-                  indent,
+                  ' ' * indent,
                   color('list number'),
                   "#{counter}. ",
                   color('list color'),
-                  indent_lines(content, indent).strip,
+                  indent_lines(content).strip,
                   xc
                 ].join
               end
@@ -687,21 +685,24 @@ module Redcarpet
       def fix_items(content, last_indent = 0, levels = [0])
         content.gsub(%r{^(?<indent> *)<<listitem(?<id>\d+)-(?<type>(?:un)?ordered)>>(?<content>.*?)<</listitem\k<id>>>}m) do
           m = Regexp.last_match
-          indent = 0
-          if indent == last_indent
-            levels[indent] ||= 0
-            levels[indent] += 1
-          elsif indent < last_indent
-            levels[last_indent] = 0
-            levels[indent] += 1
-            last_indent = indent
-          else
-            levels[indent] = 1
-            last_indent = indent
+
+          indent = m['indent'].length
+          if m['type'].to_sym == :ordered
+            if indent == last_indent
+              levels[indent] ||= 0
+              levels[indent] += 1
+            elsif indent < last_indent
+              levels[last_indent] = 0
+              levels[indent] += 1
+              last_indent = indent
+            else
+              levels[indent] = 1
+              last_indent = indent
+            end
           end
 
           content = m['content'] =~/<<listitem/ ? fix_items(m['content'], indent, levels) : m['content']
-          color_list_item(" " * indent, uncolor_grafs(content), m['type'].to_sym, levels[indent])
+          color_list_item(indent, uncolor_grafs(content), m['type'].to_sym, levels[indent])
         end
       end
 
@@ -832,7 +833,7 @@ module Redcarpet
       end
 
       def fix_image_attributes(input)
-        input.gsub(/^( {0,3}\[[^^].*?\]: *\S+) +([^"].*?)$/, '\1')
+        input.gsub(/^( {0,3}\[[^^*>].*?\]: *\S+) +([^"].*?)$/, '\1')
       end
 
       def preprocess(input)

data/lib/mdless/converter.rb

@@ -584,13 +584,17 @@ module CLIMarkdown
     end
 
     def printout
-      if MDLess.options[:taskpaper]
-        out = @output
-      else
-        out = @output.rstrip.split(/\n/).map do |p|
-          p.wrap(MDLess.cols, color('text'))
-        end.join("\n")
-      end
+      out = @output
+
+      # out = if MDLess.options[:taskpaper]
+      #         @output
+      #       else
+      #         # TODO: Figure out a word wrap that accounts for indentation
+      #         @output
+      #         # out = @output.rstrip.split(/\n/).map do |p|
+      #         #   p.wrap(MDLess.cols, color('text'))
+      #         # end.join("\n")
+      #       end
 
       unless out.size&.positive?
         MDLess.log.warn 'No results'

data/lib/mdless/version.rb

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

metadata

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