mdless 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d1b744e285d103ea81159c8663b7158a26d8609cd7411ca47c6451cf896ea8
-  data.tar.gz: 9b42221d8ed826e288067b56237af338c320c996fb57215784547ce57cc3b8f8
+  metadata.gz: ea19ef57c9cdd3b8800a854cc342e518c3c5acca0a2bfd6806f30970686e37e7
+  data.tar.gz: aaf0111e1b7777c06ddb149032985665184f92c6a34e4d5d6e7a5abecf691289
 SHA512:
-  metadata.gz: 1e168c66bc6eaf8cf30303ac4e8e33469d1d43c38c546b081aaccf5dd9cc7888aecef892e315036fa4c73c8a3bb4fe2887b35ae40169c9d3d18d60a882738c07
-  data.tar.gz: c57f891b278a448527a9ce432d5536ef09a1706132c233a27c62a44fdf273ccb6e030ca3227965f191634d3bfbc21fb4c1a4f80e28a3aed4f97e4f202178cf05
+  metadata.gz: 11e08991457fd1c94698666be37e40e38c59753b4437e94c01a45a0215d9fbf7fea00c6bedbbb5408451f8ea8402897dcf81d6a8f757950669c2c85f1371ba48
+  data.tar.gz: 997cbd5836733b2740ae15d344764c6e303d41d77ec760392a9bad6ccdc08f8aaa2457601f0385449964826d423e9f26036c5d843946e50a94ecb922f5ce4e3b

data/lib/mdless/colors.rb

@@ -71,7 +71,7 @@ module CLIMarkdown
       self.uncolor.size
     end
 
-    def wrap(width=78)
+    def wrap(width=78,foreground=:x)
 
       if self.uncolor =~ /(^([%~] |\s*>)| +[=\-]{5,})/
         return self
@@ -87,7 +87,7 @@ module CLIMarkdown
       input.split(/\s+/).each do |word|
         last_ansi = line.scan(/\e\[[\d;]+m/)[-1] || ''
         if visible_width + word.size_clean >= width
-          lines << line + xc
+          lines << line + xc(foreground)
           visible_width = word.size_clean
           line = last_ansi + word
         elsif line.empty?
@@ -98,18 +98,11 @@ module CLIMarkdown
           line << " " << last_ansi + word
         end
        end
-       lines << line + self.match(/\s*$/)[0] + xc if line
+       lines << line + self.match(/\s*$/)[0] + xc(foreground) if line
       return lines.join("\n") # .gsub(/\- (\S)/,'-\1')
     end
 
-    def xc(count=0)
-      c([:x,:white])
-    end
-
     def c(args)
-
-
-
       out = []
 
       args.each {|arg|
@@ -124,6 +117,12 @@ module CLIMarkdown
         ''
       end
     end
+
+    private
+
+    def xc(foreground=:x)
+      c([foreground])
+    end
   end
 end
 

data/lib/mdless/converter.rb

@@ -169,7 +169,7 @@ module CLIMarkdown
       if @theme.key?(keys[0])
         val = @theme[keys.shift]
       else
-        @log.error("Invalid theme key: #{key}")
+        @log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
         return c([:reset])
       end
       keys.each {|k|
@@ -360,7 +360,7 @@ module CLIMarkdown
       end
     end
 
-    def find_color(line,nullable=false)
+    def find_color(line, nullable = false)
       return line if line.nil?
       colors = line.scan(/\e\[[\d;]+m/)
       if colors && colors.size > 0
@@ -473,13 +473,14 @@ module CLIMarkdown
         color('code_block border'),
         '--[ ',
         color('code_block title'),
-        leader,
+        leader.chomp,
         color('code_block border'),
         ' ]',
-        '-'*(@cols-new_indent-leader.size+1),
+        '-'*(@cols-new_indent-leader.size-2),
         xc,
         "\n",
-        hilite,
+        hilite.chomp,
+        "\n",
         " "*(new_indent),
         color('code_block border'),
         '-'*(@cols-new_indent),
@@ -581,6 +582,44 @@ module CLIMarkdown
       #   match = Regexp.last_match
       #   "#" * (match[1].length - h_adjust)
       # end
+      #
+      # Headlines
+      @headers.each {|h|
+        input.sub!(/^#{Regexp.escape(h[2])}/m) do |m|
+          pad = ''
+          ansi = ''
+          case h[0].length
+          when 1
+            ansi = color('h1 color')
+            pad = color('h1 pad')
+            char = @theme['h1']['pad_char'] || "="
+            pad += h[1].length + 2 > @cols ? char*h[1].length : char*(@cols - (h[1].length + 1))
+          when 2
+            ansi = color('h2 color')
+            pad = color('h2 pad')
+            char = @theme['h2']['pad_char'] || "-"
+            pad += h[1].length + 2 > @cols ? char*h[1].length : char*(@cols - (h[1].length + 1))
+          when 3
+            ansi = color('h3 color')
+          when 4
+            ansi = color('h4 color')
+          when 5
+            ansi = color('h5 color')
+          else
+            ansi = color('h6 color')
+          end
+
+          # If we're in iTerm and not paginating, add
+          # iTerm Marks for navigation on h1-3
+          if h[0].length < 4 &&
+            ENV['TERM_PROGRAM'] =~ /^iterm/i &&
+            @options[:pager] == false
+            ansi = "\e]1337;SetMark\a" + ansi
+          end
+
+          "\n#{xc}#{ansi}#{h[1]} #{pad}#{xc}\n"
+        end
+      }
 
       # code block parsing
       input.gsub!(/(?i-m)(^[ \t]*[`~]{3,})([\s\S]*?)\n([\s\S]*?)\1/m) do
@@ -637,11 +676,41 @@ module CLIMarkdown
           #   previous_indent = indent
           # end
         else
+          # list items
+          # TODO: Fix ordered list numbering, pad numbers based on total number of list items
+          line.gsub!(/^(\s*)([*\-+]|\d+\.) /) do |m|
+            match = Regexp.last_match
+            last = find_color(match.pre_match)
+            mcolor = match[2] =~ /^\d+\./ ? 'list number' : 'list bullet'
+            indent = match[1] || ''
+            [
+              indent,
+              color(mcolor),
+              match[2], " ",
+              color('list color')
+            ].join
+          end
+
+          # definition lists
+          line.gsub!(/^(:\s*)(.*?)/) do |m|
+            match = Regexp.last_match
+            [
+              color('dd marker'),
+              match[1],
+              " ",
+              color('dd color'),
+              match[2],
+              xc
+            ].join
+          end
+
           # place footnotes under paragraphs that reference them
           if line =~ /\[(?:\e\[[\d;]+m)*\^(?:\e\[[\d;]+m)*(\S+)(?:\e\[[\d;]+m)*\]/
-            key = $1.uncolor
+            match = Regexp.last_match
+            key = match[1].uncolor
             if @footnotes.key? key
-              line += "\n\n#{c(%i[b black on_black])}[#{c(%i[b cyan on_black])}^#{c(%i[x yellow on_black])}#{key}#{c(%i[b black on_black])}]: #{c(%i[u white on_black])}#{@footnotes[key]}#{xc}"
+              line = "#{xc}#{line}"
+              line += "\n\n#{color('footnote brackets')}[#{color('footnote caret')}^#{color('footnote title')}#{key}#{color('footnote brackets')}]: #{color('footnote note')}#{@footnotes[key]}#{xc}"
               @footnotes.delete(key)
             end
           end
@@ -655,7 +724,7 @@ module CLIMarkdown
               counter -= 1
               find_color(lines[counter])
             end
-            "#{c(%i[b black])}[#{c(%i[b yellow])}^#{c(%i[x yellow])}#{match[1]}#{c(%i[b black])}]" + (last ? last : xc)
+            "#{color('footnote brackets')}[#{color('footnote caret')}^#{color('footnote title')}#{match[1]}#{color('footnote brackets')}]" + (last ? last : xc)
           end
 
           # blockquotes
@@ -671,7 +740,6 @@ module CLIMarkdown
           end
 
           # make reference links inline
-
           line.gsub!(/(?<![\e*])\[(\b.*?\b)?\]\[(\b.+?\b)?\]/) do |m|
             match = Regexp.last_match
             title = match[2] || ''
@@ -695,23 +763,6 @@ module CLIMarkdown
             color_link(match.pre_match, match[1], match[2])
           end
 
-
-
-          # inline code
-          line.gsub!(/`(.*?)`/) do |m|
-            match = Regexp.last_match
-            last = find_color(match.pre_match, true)
-            [
-              color('code_span marker'),
-              '`',
-              color('code_span color'),
-              match[1],
-              color('code_span marker'),
-              '`',
-              last ? last : xc
-            ].join
-          end
-
           # horizontal rules
           line.gsub!(/^ {,3}([\-*] ?){3,}$/) do |m|
             color('hr color') + '_'*@cols + xc
@@ -746,7 +797,7 @@ module CLIMarkdown
           end
 
           # equations
-          line.gsub!(/((\\\\\[)(.*?)(\\\\\])|(\\\\\()(.*?)(\\\\\)))/) do |m|
+          line.gsub!(/((\\\\\[|\$\$)(.*?)(\\\\\]|\$\$)|(\\\\\(|\$)(.*?)(\\\\\)|\$))/) do |m|
             match = Regexp.last_match
             last = find_color(match.pre_match)
             if match[2]
@@ -759,34 +810,6 @@ module CLIMarkdown
             "#{c(%i[b black])}#{brackets[0]}#{xc}#{c(%i[b blue])}#{equat}#{c(%i[b black])}#{brackets[1]}" + (last ? last : xc)
           end
 
-          # list items
-          # TODO: Fix ordered list numbering, pad numbers based on total number of list items
-          line.gsub!(/^(\s*)([*\-+]|\d+\.) /) do |m|
-            match = Regexp.last_match
-            last = find_color(match.pre_match)
-            mcolor = match[2] =~ /^\d+\./ ? 'list number' : 'list bullet'
-            indent = match[1] || ''
-            [
-              indent,
-              color(mcolor),
-              match[2], " ",
-              color('list color')
-            ].join
-          end
-
-          # definition lists
-          line.gsub!(/^(:\s*)(.*?)/) do |m|
-            match = Regexp.last_match
-            [
-              color('dd marker'),
-              match[1],
-              " ",
-              color('dd color'),
-              match[2],
-              xc
-            ].join
-          end
-
           # misc html
           line.gsub!(/<br\/?>/, "\n")
           line.gsub!(/(?i-m)((<\/?)(\w+[\s\S]*?)(>))/) do |tag|
@@ -802,51 +825,33 @@ module CLIMarkdown
               last ? last : xc
             ].join
           end
+
+          # inline code spans
+          line.gsub!(/`(.*?)`/) do |m|
+            match = Regexp.last_match
+            last = find_color(match.pre_match, true)
+            [
+              color('code_span marker'),
+              '`',
+              color('code_span color'),
+              match[1],
+              color('code_span marker'),
+              '`',
+              last ? last : xc
+            ].join
+          end
         end
 
+        ## Should force a foreground color but doesn't...
+        # unless line =~ /^\s*\e\[[\d;]+m/
+        #   line.sub!(/^(\s*)/, "\\1#{color('text')}")
+        # end
+
         line
       end
 
       input = lines.join("\n")
 
-      # Headlines
-      @headers.each {|h|
-        input.sub!(/^#{Regexp.escape(h[2])}/m) do |m|
-          pad = ''
-          ansi = ''
-          case h[0].length
-          when 1
-            ansi = color('h1 color')
-            pad = color('h1 pad')
-            char = @theme['h1']['pad_char'] || "="
-            pad += h[1].length + 2 > @cols ? char*h[1].length : char*(@cols - (h[1].length + 1))
-          when 2
-            ansi = color('h2 color')
-            pad = color('h2 pad')
-            char = @theme['h2']['pad_char'] || "-"
-            pad += h[1].length + 2 > @cols ? char*h[1].length : char*(@cols - (h[1].length + 1))
-          when 3
-            ansi = color('h3 color')
-          when 4
-            ansi = color('h4 color')
-          when 5
-            ansi = color('h5 color')
-          else
-            ansi = color('h6 color')
-          end
-
-          # If we're in iTerm and not paginating, add
-          # iTerm Marks for navigation on h1-3
-          if h[0].length < 4 &&
-            ENV['TERM_PROGRAM'] =~ /^iterm/i &&
-            @options[:pager] == false
-            ansi = "\e]1337;SetMark\a" + ansi
-          end
-
-          "\n#{xc}#{ansi}#{h[1]} #{pad}#{xc}\n"
-        end
-      }
-
       # images
       input.gsub!(/^(.*?)!\[(.*)?\]\((.*?\.(?:png|gif|jpg))( +.*)?\)/) do |m|
         match = Regexp.last_match
@@ -985,7 +990,7 @@ module CLIMarkdown
 
     def printout
       out = @output.rstrip.split(/\n/).map {|p|
-        p.wrap(@cols)
+        p.wrap(@cols, color('text'))
       }.join("\n")
 
 
@@ -1048,5 +1053,9 @@ module CLIMarkdown
 
       [pg, args]
     end
+
+    def xc
+      color('text')
+    end
   end
 end

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.21'
+  VERSION = '1.0.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake