mdless 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a4f667f7783166c9dd1d60ae77698058d9c240d014cd911ac27c4cce2b616b7
-  data.tar.gz: f1db62b7e655e58a2c391fa3092e2497f69ba36b31b327686ed7e79846fdd3a0
+  metadata.gz: 350da3408205b06f5ef3b792190c11f0a1f2a22139f40472da1922486f2b1358
+  data.tar.gz: aad6fe5044525feab00af45cd757c1f5d5b1f3478a429db681a1bf86d9ea863e
 SHA512:
-  metadata.gz: 3ee079617708ae07d18265be581c983631c01ef19187079e137d2244493b09fef7ce6048c0104fb2fc4123a8fce46abadc301d46d391180e1d2f8c2fd6443bfd
-  data.tar.gz: 1710ad0309375ef8728521c1d883a7f2b13c7bef2cf5ac5325f497de27b690d36b208f706ec8a8f9fec178a994f0abef698619636815c5d5425b949c6722e708
+  metadata.gz: 1a5a65f8caf5a8c62b3c0e2ba7a712df1d6d1ce1948e90e76c0ee599833f9b4844683c3d6d86874cb477b9ca307ec7f5b75339e26c7696117ac564ddd99b5cef
+  data.tar.gz: 9038fbdc4b9e161b6531af8ad59bbc9707f3eab158818e9b0b15b9434fd388f716d9e11602d8bfc15a8cbdbabe14efe462081a8d90ff41f3543106d924d07dc1

data/README.md

@@ -1,7 +1,6 @@
 
 # mdless
 
-
 `mdless` is a utility that provides a formatted and highlighted view of Markdown files in Terminal.
 
 I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a way to view Markdown files quickly and without cruft.
@@ -16,9 +15,12 @@ I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a
 - Normalize spacing and link formatting
 - Display footnotes after each paragraph
 - Inline image display (local, optionally remote) if using iTerm2 2.9+
-- Syntax highlighting when `pygmentize` is available
+- Syntax highlighting when [Pygments](http://pygments.org/) is installed
+    - Only fenced code with a language defined (e.g. `\`\`\`python`) will be highlighted
+    - Languages can also be determined by hashbang in the code block
 - List headlines in document
-- Display single section of the document based on headlines
+    - Display single section of the document based on headlines
+- Customizable colors
 
 ## Installation
 
@@ -40,7 +42,7 @@ The pager used is determined by system configuration in this order of preference
 
 ### Options
 
-    -s, --section=TITLE              Output only a headline-based section of 
+    -s, --section=NUMBER              Output only a headline-based section of 
                                      the input (numeric based on --list output)
     -w, --width=COLUMNS              Column width to format for (default terminal width)
     -p, --[no-]pager                 Formatted output to pager (default on)
@@ -54,5 +56,51 @@ The pager used is determined by system configuration in this order of preference
     -h, --help                       Display this screen
     -v, --version                    Display version number
 
+## Customization
+
+On first run a default theme file will be placed in `~/.config/mdless/mdless.theme`. You can edit this file to modify the colors mdless uses when highlighting your files.
+
+Colors are limited to basic ANSI codes, with support for bold, underline, italics (if available for the terminal/font), dark and bright, and foreground and background colors.
+
+Customizeable settings are stored in [YAML](https://yaml.org) format. A chunk of the settings file looks like this:
+
+```yaml
+h1:
+  color: b intense_black on_white
+  pad: d black on_white
+  pad_char: "="
+```
+
+Font and color settings are set using a string of color names and modifiers. A typical string looks like `b red on_white`, which would give you a bold red font on a white background. In the YAML settings file there's no need for quotes, just put the string following the colon for the setting.
+
+Some extra (non-color) settings are available for certain keys, e.g. `pad_char` to define the right padding character used on level 1 and 2 headlines. Note that you can change the [Pygments](http://pygments.org/) theme used for syntax highlighting with the code_block.pygments_theme setting. For a list of available styles (assuming you have Pygments installed), use `pygmentize -L styles`.
+
+*Note:* the ANSI escape codes are reset every time the color changes, so, for example, if you have a key that defines underlines for the url in a link, the underline will automatically be removed when it gets to a bracket. This also means that if you define a background color, you'll need to define it again on all the keys that it should affect.
+
+Base colors:
+
+- black
+- red
+- green
+- yellow
+- blue
+- magenta
+- cyan
+- white
+
+Emphasis:
+
+- b (bold)
+- d (dark)
+- i (italic)
+- u (underline)
+- r (reverse, negative)
+
+To modify the emphasis, use 'b' (bold), 'i' (italic), 'u' (underline), e.g. `u yellow` for underlined yellow. These can be combined, e.g. `b u red`.
+
+Use 'r' to reverse foreground and background colors. `r white on_black` would display as `black on_white`. 'r' alone will reverse the current color set for a line.
+
+To set a background color, use `on_[color]` with one of the 8 colors. This can be used with foreground colors in the same setting, e.g. `white on_black`.
 
+Use 'd' (dark) to indicate the darker version of a foreground color. On macOS (and possibly other systems) you can use the brighter version of a color by prefixing with "intense", e.g. `intense_red` or `on_intense_black`.
 

data/lib/mdless/colors.rb

@@ -1,12 +1,66 @@
 module CLIMarkdown
   module Colors
 
+    COLORS = {
+            :reset => 0,     # synonym for :clear
+            :x => 0,
+            :bold => 1,
+            :b => 1,
+            :dark => 2,
+            :d => 2,
+            :italic => 3,     # not widely implemented
+            :i => 3,
+            :underline => 4,
+            :underscore => 4,     # synonym for :underline
+            :u => 4,
+            :blink => 5,
+            :rapid_blink => 6,     # not widely implemented
+            :negative => 7,     # no reverse because of String#reverse
+            :r => 7,
+            :concealed => 8,
+            :strikethrough => 9,     # not widely implemented
+            :black => 30,
+            :red => 31,
+            :green => 32,
+            :yellow => 33,
+            :blue => 34,
+            :magenta => 35,
+            :cyan => 36,
+            :white => 37,
+            :on_black => 40,
+            :on_red => 41,
+            :on_green => 42,
+            :on_yellow => 43,
+            :on_blue => 44,
+            :on_magenta => 45,
+            :on_cyan => 46,
+            :on_white => 47,
+            :intense_black => 90,    # High intensity, aixterm (works in OS X)
+            :intense_red => 91,
+            :intense_green => 92,
+            :intense_yellow => 93,
+            :intense_blue => 94,
+            :intense_magenta => 95,
+            :intense_cyan => 96,
+            :intense_white => 97,
+            :on_intense_black => 100,    # High intensity background, aixterm (works in OS X)
+            :on_intense_red => 101,
+            :on_intense_green => 102,
+            :on_intense_yellow => 103,
+            :on_intense_blue => 104,
+            :on_intense_magenta => 105,
+            :on_intense_cyan => 106,
+            :on_intense_white => 107
+          }
+
     def uncolor
       self.gsub(/\e\[[\d;]+m/,'')
     end
 
-    def blackout
-      self.gsub(/(^|$)/,"\e[40m").gsub(/3([89])m/,"40;3\\1m")
+    def blackout(bgcolor)
+      key = bgcolor.to_sym
+      bg = COLORS.key?(key) ? COLORS[key] : 40
+      self.gsub(/(^|$)/,"\e[#{bg}m").gsub(/3([89])m/,"#{bg};3\\1m")
     end
 
     def uncolor!
@@ -54,63 +108,13 @@ module CLIMarkdown
 
     def c(args)
 
-      colors = {
-            :reset => 0,     # synonym for :clear
-            :x => 0,
-            :bold => 1,
-            :b => 1,
-            :dark => 2,
-            :d => 2,
-            :italic => 3,     # not widely implemented
-            :i => 3,
-            :underline => 4,
-            :underscore => 4,     # synonym for :underline
-            :u => 4,
-            :blink => 5,
-            :rapid_blink => 6,     # not widely implemented
-            :negative => 7,     # no reverse because of String#reverse
-            :r => 7,
-            :concealed => 8,
-            :strikethrough => 9,     # not widely implemented
-            :black => 30,
-            :red => 31,
-            :green => 32,
-            :yellow => 33,
-            :blue => 34,
-            :magenta => 35,
-            :cyan => 36,
-            :white => 37,
-            :on_black => 40,
-            :on_red => 41,
-            :on_green => 42,
-            :on_yellow => 43,
-            :on_blue => 44,
-            :on_magenta => 45,
-            :on_cyan => 46,
-            :on_white => 47,
-            :intense_black => 90,    # High intensity, aixterm (works in OS X)
-            :intense_red => 91,
-            :intense_green => 92,
-            :intense_yellow => 93,
-            :intense_blue => 94,
-            :intense_magenta => 95,
-            :intense_cyan => 96,
-            :intense_white => 97,
-            :on_intense_black => 100,    # High intensity background, aixterm (works in OS X)
-            :on_intense_red => 101,
-            :on_intense_green => 102,
-            :on_intense_yellow => 103,
-            :on_intense_blue => 104,
-            :on_intense_magenta => 105,
-            :on_intense_cyan => 106,
-            :on_intense_white => 107
-          }
+
 
       out = []
 
       args.each {|arg|
-        if colors.key? arg
-          out << colors[arg]
+        if COLORS.key? arg
+          out << COLORS[arg]
         end
       }
 

data/lib/mdless/converter.rb

@@ -1,3 +1,13 @@
+require 'fileutils'
+require 'yaml'
+
+class ::Hash
+    def deep_merge(second)
+        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+        self.merge(second.to_h, &merger)
+    end
+end
+
 module CLIMarkdown
   class Converter
     include Colors
@@ -12,12 +22,119 @@ module CLIMarkdown
       @log = Logger.new(STDERR)
       @log.level = Logger::ERROR
 
+      config_dir = File.expand_path('~/.config/mdless')
+      theme_file = File.join(config_dir,'mdless.theme')
+
+      theme_defaults = {
+        'metadata' => {
+          'border' => 'd blue on_black',
+          'marker' => 'd black on_black',
+          'color' => 'd white on_black'
+        },
+        'h1' => {
+          'color' => 'b intense_black on_white',
+          'pad' => 'd black on_white',
+          'pad_char' => '='
+        },
+        'h2' => {
+          'color' => 'b white on_intense_black',
+          'pad' => 'd white on_intense_black',
+          'pad_char' => '-'
+        },
+        'h3' => {
+          'color' => 'u b yellow'
+        },
+        'h4' => {
+          'color' => 'u yellow'
+        },
+        'h5' => {
+          'color' => 'b white'
+        },
+        'h6' => {
+          'color' => 'b white'
+        },
+        'link' => {
+          'brackets' => 'b black',
+          'text' => 'u b blue',
+          'url' => 'cyan'
+        },
+        'image' => {
+          'bang' => 'red',
+          'brackets' => 'b black',
+          'title' => 'cyan',
+          'url' => 'u yellow'
+        },
+        'list' => {
+          'bullet' => 'b intense_red',
+          'number' => 'b intense_blue',
+          'color' => 'intense_white'
+        },
+        'footnote' => {
+          'brackets' => 'b black on_black',
+          'caret' => 'b yellow on_black',
+          'title' => 'x yellow on_black',
+          'note' => 'u white on_black'
+        },
+        'code_span' => {
+          'marker' => 'b white',
+          'color' => 'b black on_intense_blue'
+        },
+        'code_block' => {
+          'marker' => 'intense_black',
+          'bg' => 'on_black',
+          'color' => 'white on_black',
+          'border' => 'blue',
+          'title' => 'magenta',
+          'eol' => 'intense_black on_black',
+          'pygments_theme' => 'monokai'
+        },
+        'dd' => {
+          'marker' => 'd red',
+          'color' => 'b white'
+        },
+        'hr' => {
+          'color' => 'd white'
+        },
+        'table' => {
+          'border' => 'd black',
+          'header' => 'yellow',
+          'divider' => 'b black',
+          'color' => 'white'
+        },
+        'html' => {
+          'brackets' => 'd yellow on_black',
+          'color' => 'yellow on_black'
+        }
+      }
+
+      unless File.directory?(config_dir)
+        @log.info("Creating config directory at #{config_dir}")
+        FileUtils.mkdir_p(config_dir)
+      end
+
+      unless File.exists?(theme_file)
+        @log.info("Writing fresh theme file to #{theme_file}")
+        File.open(theme_file,'w') {|f|
+          f.puts @theme.to_yaml
+        }
+        @theme = theme_defaults
+      else
+        new_theme = YAML.load(IO.read(theme_file))
+        begin
+          @theme = theme_defaults.deep_merge(new_theme)
+        rescue
+          @log.warn('Error merging user theme')
+          @theme = theme_defaults
+        end
+      end
+
+
       @options = {}
       optparse = OptionParser.new do |opts|
         opts.banner = "#{version} by Brett Terpstra\n\n> Usage: #{CLIMarkdown::EXECUTABLE_NAME} [options] [path]\n\n"
 
         @options[:section] = nil
-        opts.on( '-s', '--section=TITLE', 'Output only a headline-based section of the input (numeric from -l)' ) do |section|
+        opts.on( '-s', '--section=NUMBER', 'Output only a headline-based section of the input (numeric from --list)' ) do |section|
           @options[:section] = section.to_i
         end
 
@@ -41,7 +158,7 @@ module CLIMarkdown
         end
 
         @options[:links] = :inline
-        opts.on( '--links=FORMAT', 'Link style ([inline, reference], default inline)' ) do |format|
+        opts.on( '--links=FORMAT', 'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]' ) do |format|
           if format =~ /^r/i
             @options[:links] = :reference
           end
@@ -95,7 +212,8 @@ module CLIMarkdown
 
       @cols = @options[:width]
       @output = ''
-      @header_arr = []
+      @headers = []
+      @setheaders = []
 
       input = ''
       @ref_links = {}
@@ -139,9 +257,58 @@ module CLIMarkdown
       end
     end
 
+    def color(key)
+      val = nil
+      keys = key.split(/[ ,>]/)
+      if @theme.key?(keys[0])
+        val = @theme[keys.shift]
+      else
+        @log.error("Invalid theme key: #{key}")
+        return c([:reset])
+      end
+      keys.each {|k|
+        if val.key?(k)
+          val = val[k]
+        else
+          @log.error("Invalid theme key: #{k}")
+          return c([:reset])
+        end
+      }
+      if val.kind_of? String
+        val = "x #{val}"
+        res = val.split(/ /).map {|k|
+          k.to_sym
+        }
+        c(res)
+      else
+        c([:reset])
+      end
+    end
+
     def get_headers(input)
       unless @headers && @headers.length > 0
-        @headers = input.scan(/^(#+)\s*(.*?)( #+)?\s*$/)
+        @headers = []
+        headers = input.scan(/^((?!#!)(\#{1,6})\s*([^#]+?)(?: #+)?\s*|(.*?)\n([=-]+))$/i)
+
+        headers.each {|h|
+          hlevel = 6
+          title = nil
+          if h[4] =~ /=+/
+            hlevel = 1
+            title = h[3]
+          elsif h[4] =~ /-+/
+            hlevel = 2
+            title = h[3]
+          else
+            hlevel = h[1].length
+            title = h[2]
+          end
+          @headers << [
+            '#'*hlevel,
+            title,
+            h[0]
+          ]
+        }
       end
       @headers
     end
@@ -192,9 +359,9 @@ module CLIMarkdown
     end
 
     def highest_header(input)
-      headers = input.scan(/^(#+)/)
+      @headers = get_headers(input)
       top = 6
-      headers.each {|h|
+      @headers.each {|h|
         top = h[0].length if h[0].length < top
       }
       top
@@ -205,12 +372,12 @@ module CLIMarkdown
       input.split(/\n/).map{|line|
         if first
           first = false
-          line.gsub!(/\|/, "#{c(%i[d black])}|#{c(%i[x yellow])}")
+          line.gsub!(/\|/, "#{color('table border')}|#{color('table header')}")
         elsif line.strip =~ /^[|:\- ]+$/
-          line.gsub!(/^(.*)$/, "#{c(%i[d black])}\\1#{c(%i[x white])}")
-          line.gsub!(/([:\-]+)/,"#{c(%i[b black])}\\1#{c(%i[d black])}")
+          line.gsub!(/^(.*)$/, "#{color('table border')}\\1#{color('table color')}")
+          line.gsub!(/([:\-]+)/,"#{color('table divider')}\\1#{color('table border')}")
         else
-          line.gsub!(/\|/, "#{c(%i[d black])}|#{c(%i[x white])}")
+          line.gsub!(/\|/, "#{color('table border')}|#{color('table color')}")
         end
       }.join("\n")
     end
@@ -289,22 +456,39 @@ module CLIMarkdown
     end
 
     def color_link(line, text, url)
-      out = c(%i[b black])
-      out += "[#{c(%i[u blue])}#{text}"
-      out += c(%i[b black])
-      out += "]("
-      out += c(%i[x cyan])
-      out += url
-      out += c(%i[b black])
-      out += ")"
-      out += find_color(line)
-      out
+      [
+        color('link brackets'),
+        "[",
+        color('link text'),
+        text,
+        color('link brackets'),
+        "](",
+        color('link url'),
+        url,
+        color('link brackets'),
+        ")",
+        find_color(line)
+      ].join
     end
 
     def color_image(line, text, url)
-      text.gsub!(/\e\[0m/,c(%i[x cyan]))
-
-      "#{c(%i[x red])}!#{c(%i[b black])}[#{c(%i[x cyan])}#{text}#{c(%i[b black])}](#{c(%i[u yellow])}#{url}#{c(%i[b black])})" + find_color(line)
+      text.gsub!(/\e\[0m/,color('image title'))
+
+      [
+        color('image bang'),
+        "!",
+        color('image brackets'),
+        "[",
+        color('image title'),
+        text,
+        color('image brackets'),
+        "](",
+        color('image url'),
+        url,
+        color('image brackets'),
+        ")",
+        find_color(line)
+      ].join
     end
 
     def valid_lexer?(language)
@@ -333,19 +517,19 @@ module CLIMarkdown
       if exec_available('pygmentize') && language && valid_lexer?(language)
         lexer = "-l #{language}"
         begin
-          hilite, s = Open3.capture2(%Q{pygmentize -f terminal256 -O style=monokai #{lexer} 2> /dev/null}, :stdin_data=>codeBlock)
+          hilite, s = Open3.capture2(%Q{pygmentize -f terminal256 -O style=#{@theme['code_block']['pygments_theme']} #{lexer} 2> /dev/null}, :stdin_data=>codeBlock)
           if s.success?
 
             hilite = xc + hilite.split(/\n/).map{|l|
               new_code_line = l.gsub(/\t/, '    ')
               new_code_line.sub!(/^#{" "*first_indent}/,'')
               [
-                c(%i[x intense_black]),
+                color('code_block marker'),
                 "> ",
                 " "*first_indent,
-                "#{c([:on_black])}#{l}"
+                "#{color('code_block bg')}#{l}"
               ].join
-            }.join("\n").blackout + "#{xc}\n"
+            }.join("\n").blackout(@theme['code_block']['bg']) + "#{xc}\n"
           end
         rescue => e
           @log.error(e)
@@ -355,19 +539,38 @@ module CLIMarkdown
         hilite = codeBlock.split(/\n/).map do |line|
           new_code_line = line.gsub(/\t/, '    ')
           new_code_line.sub!(/^#{" "*first_indent}/,'')
-          new_code_line.gsub!(/ /, "#{c(%i[x white on_black])} ")
+          new_code_line.gsub!(/ /, "#{color('code_block color')} ")
           [
-            c(%i[x intense_black]),
+            color('code_block marker'),
             "> ",
             " "*first_indent,
-            c(%i[x white on_black]),
+            color('code_block color'),
             new_code_line,
             xc
           ].join
         end.join("\n") + "\n"
       end
 
-      "#{xc}\n#{" "*first_indent}#{c(%i[x blue]) + '--[ '}#{c(%i[x magenta])}#{leader}#{c(%i[x blue]) + ' ]' + '-'*(@cols-new_indent-leader.size+1) + xc}\n#{hilite}#{" "*(new_indent)}#{c(%i[x blue]) + '-'*(@cols-new_indent) + xc}\n"
+      [
+        xc,
+        "\n",
+        " "*first_indent,
+        color('code_block border'),
+        '--[ ',
+        color('code_block title'),
+        leader,
+        color('code_block border'),
+        ' ]',
+        '-'*(@cols-new_indent-leader.size+1),
+        xc,
+        "\n",
+        hilite,
+        " "*(new_indent),
+        color('code_block border'),
+        '-'*(@cols-new_indent),
+        xc,
+        "\n"
+      ].join
     end
 
     def convert_markdown(input)
@@ -380,14 +583,13 @@ module CLIMarkdown
         in_yaml = true
         input.sub!(/(?i-m)^---[ \t]*\n([\s\S]*?)\n[\-.]{3}[ \t]*\n/) do |yaml|
           m = Regexp.last_match
-
           @log.info("Processing YAML Header")
           m[0].split(/\n/).map {|line|
             if line =~ /^[\-.]{3}\s*$/
-              line = c(%i[d black on_black]) + "% " + c(%i[d black on_black]) + line
+              line = color('metadata marker') + "%% " + color('metadata border') + line
             else
               line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-              line = c(%i[d black on_black]) + "% " + c(%i[d white]) + line
+              line = color('metadata marker') + "%% " + color('metadata color') + line
             end
             if @cols - line.uncolor.size > 0
               line += " "*(@cols-line.uncolor.size)
@@ -399,10 +601,9 @@ module CLIMarkdown
       if !in_yaml && input.gsub(/\n/,' ') =~ /(?i-m)^\w.+:\s+\S+ /
         @log.info("Found MMD Headers")
         input.sub!(/(?i-m)^([\S ]+:[\s\S]*?)+(?=\n\n)/) do |mmd|
-          puts mmd
           mmd.split(/\n/).map {|line|
             line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-            line = c(%i[d black on_black]) + "% " + c(%i[d white on_black]) + line
+            line = color('metadata marker') + "%% " + color('metadata color') + line
             if @cols - line.uncolor.size > 0
               line += " "*(@cols - line.uncolor.size)
             end
@@ -420,6 +621,7 @@ module CLIMarkdown
       end
 
       # Gather footnotes (non-inline)
+      # TODO: Need to implement option to output links as references
       input.gsub!(/^ {,3}(?<!\*)(?:\e\[[\d;]+m)*\[(?:\e\[[\d;]+m)*\^(?:\e\[[\d;]+m)*\b(.+)\b(?:\e\[[\d;]+m)*\]: *(.*?)\n/) do |m|
         match = Regexp.last_match
         @footnotes[match[1].uncolor] = match[2].uncolor
@@ -483,7 +685,7 @@ module CLIMarkdown
             code_block = m[3]
             leader = shebang[1] ? shebang[1] : 'code'
           else
-            code_block = pad_max(m[3].to_s, "#{c(%i[intense_black on_black])}¬")
+            code_block = pad_max(m[3].to_s, "#{color('code_block eol')}¬")
             leader = language ? language : 'code'
           end
         end
@@ -519,31 +721,6 @@ module CLIMarkdown
           #   previous_indent = indent
           # end
         else
-          # Headlines
-          line.gsub!(/^(#+) *(.*?)(\s*#+)?\s*$/) do |match|
-            m = Regexp.last_match
-            pad = ""
-            ansi = ''
-            case m[1].length
-            when 1
-              ansi = c(%i[b black on_intense_white])
-              pad = c(%i[b white])
-              pad += m[2].length + 2 > @cols ? "*"*m[2].length : "*"*(@cols - (m[2].length + 2))
-            when 2
-              ansi = c(%i[b green on_black])
-              pad = c(%i[b black])
-              pad += m[2].length + 2 > @cols ? "-"*m[2].length : "-"*(@cols - (m[2].length + 2))
-            when 3
-              ansi = c(%i[u b yellow])
-            when 4
-              ansi = c(%i[x u yellow])
-            else
-              ansi = c(%i[b white])
-            end
-
-            "\n#{xc}#{ansi}#{m[2]} #{pad}#{xc}\n"
-          end
-
           # place footnotes under paragraphs that reference them
           if line =~ /\[(?:\e\[[\d;]+m)*\^(?:\e\[[\d;]+m)*(\S+)(?:\e\[[\d;]+m)*\]/
             key = $1.uncolor
@@ -578,6 +755,7 @@ module CLIMarkdown
           end
 
           # make reference links inline
+
           line.gsub!(/(?<![\e*])\[(\b.*?\b)?\]\[(\b.+?\b)?\]/) do |m|
             match = Regexp.last_match
             title = match[2] || ''
@@ -607,12 +785,20 @@ module CLIMarkdown
           line.gsub!(/`(.*?)`/) do |m|
             match = Regexp.last_match
             last = find_color(match.pre_match, true)
-            "#{c(%i[b black])}`#{c(%i[b white])}#{match[1]}#{c(%i[b black])}`" + (last ? last : xc)
+            [
+              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|
-            c(%i[x black]) + '_'*@cols + xc
+            color('hr color') + '_'*@cols + xc
           end
 
           # bold, bold/italic
@@ -659,14 +845,27 @@ module CLIMarkdown
           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}#{c(%i[d red])}#{match[2]} " + (last ? last : xc)
+            [
+              indent,
+              color(mcolor),
+              match[2], " ",
+              color('list color')
+            ].join
           end
 
           # definition lists
           line.gsub!(/^(:\s*)(.*?)/) do |m|
             match = Regexp.last_match
-            "#{c(%i[d red])}#{match[1]} #{c(%i[b white])}#{match[2]}#{xc}"
+            [
+              color('dd marker'),
+              match[1],
+              " ",
+              color('dd color'),
+              match[2],
+              xc
+            ].join
           end
 
           # misc html
@@ -674,7 +873,15 @@ module CLIMarkdown
           line.gsub!(/(?i-m)((<\/?)(\w+[\s\S]*?)(>))/) do |tag|
             match = Regexp.last_match
             last = find_color(match.pre_match)
-            "#{c(%i[d yellow on_black])}#{match[2]}#{match[3]}#{match[4]}" + (last ? last : xc)
+            [
+              color('html brackets'),
+              match[2],
+              color('html color'),
+              match[3],
+              color('html brackets'),
+              match[4],
+              last ? last : xc
+            ].join
           end
         end
 
@@ -683,6 +890,36 @@ module CLIMarkdown
 
       input = lines.join("\n")
 
+      # Headlines
+      @headers.each {|h|
+        input.sub!(/^#{h[2]}/) 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
+
+          "\n#{xc}#{ansi}#{h[1]} #{pad}#{xc}\n"
+        end
+      }
+
       # images
       input.gsub!(/^(.*?)!\[(.*)?\]\((.*?\.(?:png|gif|jpg))( +.*)?\)/) do |m|
         match = Regexp.last_match
@@ -731,7 +968,20 @@ module CLIMarkdown
       end
 
       @footnotes.each {|t, v|
-        input += "\n\n#{c(%i[b black on_black])}[#{c(%i[b yellow on_black])}^#{c(%i[x yellow on_black])}#{t}#{c(%i[b black on_black])}]: #{c(%i[u white on_black])}#{v}#{xc}"
+        input += [
+          "\n\n",
+          color('footnote brackets'),
+          "[",
+          color('footnote caret'),
+          "^",
+          color('footnote title'),
+          t,
+          color('footnote brackets'),
+          "]: ",
+          color('footnote note'),
+          v,
+          xc
+        ].join
       }
 
       @output += input
@@ -760,6 +1010,7 @@ module CLIMarkdown
         IO.select [input]
 
         pager = which_pager
+        @log.info(%{Using #{pager} as pager})
         begin
           exec(pager.join(' '))
         rescue SystemCallError => e
@@ -805,13 +1056,13 @@ module CLIMarkdown
     def which_pager
       pagers = [ENV['GIT_PAGER'], ENV['PAGER'],
                 `git config --get-all core.pager || true`.split.first,
-                'less', 'more', 'cat', 'pager']
+                'bat', 'less', 'more', 'cat', 'pager']
       pagers.select! do |f|
         if f
           if f.strip =~ /[ |]/
             f
           else
-          system "which #{f}", :out => File::NULL
+            system "which #{f}", :out => File::NULL
           end
         else
           false

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake