RubyGems - mdless - Versions diffs - 1.0.37 → 2.0.1 - Mend

mdless 1.0.37 → 2.0.1

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e5b5ce0612ca6b58434e65c449761b9f59e9722f3e7ae6abc107a975b793e8
-  data.tar.gz: 4e09831ca7e91aaf6d78dfbec3d7eb74ca8e372c51ec202188c4aefedd3e30c8
+  metadata.gz: c645677f1a192348600bf54180afe501b76888d14bad121c4577090ca81718b2
+  data.tar.gz: 7e82688bd079cede12e529a813c628297070b91b47d68276e54b368b7155bc25
 SHA512:
-  metadata.gz: 304f7590b03f8ab1efb52ef6142a57911167b49d2af7b616f41ae71136aab5fc47a0f772074b76f69c74fc142588be71ee2c507a93bb07c5efb63fb2e92db026
-  data.tar.gz: 4f2d406c790457383b6b87f81ab5c9b7a2dd92a9c716582fe3ebf5a58d385a11308fee5c2b405bf8a21e4ee283dc2b5e284bce6b74e273abdb3051056f9c713b
+  metadata.gz: 830a9aea162d1481ceca6a5dd9cfed3e1a46821a4f1ceaae0d77a843d19a9d0515338025120bc8cfd6bd55fec449009782be872f6558d01d55155bfea9699804
+  data.tar.gz: ae994c34ece07c3fa05cad41c0e28c866e642dd268a6d175e8746bbd1c8e4d492ca1eef4b943ba506b4769079958296f0ac885e3a10eadc37d595164618db349

data/bin/mdless CHANGED Viewed

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W1
 # frozen_string_literal: true
 require 'mdless'

data/lib/mdless/converter.rb CHANGED Viewed

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'yaml'
-require 'fileutils'
 module CLIMarkdown
   class Converter
@@ -14,23 +13,26 @@ module CLIMarkdown
     end
     def initialize(args)
-      @log = Logger.new(STDERR)
+      @log = Logger.new($stderr)
       @log.level = Logger::ERROR
       @options = {}
+      config = File.expand_path('~/.config/mdless/config.yml')
+      @options = YAML.load(IO.read(config)) if File.exist?(config)
       optparse = OptionParser.new do |opts|
         opts.banner = "#{version} by Brett Terpstra\n\n> Usage: #{CLIMarkdown::EXECUTABLE_NAME} [options] [path]\n\n"
-        @options[:color] = true
+        @options[:color] ||= true
         opts.on('-c', '--[no-]color', 'Colorize output (default on)') do |c|
           @options[:color] = c
         end
-        opts.on('-d', '--debug LEVEL', 'Level of debug messages to output') do |level|
-          if level.to_i > 0 && level.to_i < 5
+        opts.on('-d', '--debug LEVEL', 'Level of debug messages to output (1-4, 4 to see all messages)') do |level|
+          if level.to_i.positive? && level.to_i < 5
             @log.level = 5 - level.to_i
           else
-            $stderr.puts "Error: Log level out of range (1-4)"
+            puts 'Error: Debug level out of range (1-4)'
             Process.exit 1
           end
         end
@@ -40,18 +42,19 @@ module CLIMarkdown
           exit
         end
-        @options[:local_images] = false
-        @options[:remote_images] = false
-        opts.on('-i', '--images=TYPE', 'Include [local|remote (both)] images in output (requires chafa or imgcat, default NONE). imgcat does not work with pagers, use with -P' ) do |type|
-          unless exec_available('imgcat') || exec_available('chafa')# && ENV['TERM_PROGRAM'] == 'iTerm.app'
-            @log.warn('images turned on but imgcat/chafa not found')
-          else
+        @options[:local_images] ||= false
+        @options[:remote_images] ||= false
+        opts.on('-i', '--images=TYPE',
+                'Include [local|remote (both)] images in output (requires chafa or imgcat, default NONE).') do |type|
+          if exec_available('imgcat') || exec_available('chafa')
             if type =~ /^(r|b|a)/i
               @options[:local_images] = true
               @options[:remote_images] = true
             elsif type =~ /^l/i
               @options[:local_images] = true
             end
+          else
+            @log.warn('images turned on but imgcat/chafa not found')
           end
         end
         opts.on('-I', '--all-images', 'Include local and remote images in output (requires imgcat or chafa)') do
@@ -63,19 +66,23 @@ module CLIMarkdown
           end
         end
-        @options[:links] = :inline
-        opts.on('--links=FORMAT', 'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]') do |format|
-          if format =~ /^r/i
-            @options[:links] = :reference
-          end
+        @options[:syntax_higlight] ||= false
+        opts.on('--syntax', 'Syntax highlight code blocks') do |p|
+          @options[:syntax_higlight] = p
+        end
+        @options[:links] ||= :inline
+        opts.on('--links=FORMAT',
+                'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]') do |format|
+          @options[:links] = :reference if format =~ /^r/i
         end
-        @options[:list] = false
-        opts.on('-l', '--list', 'List headers in document and exit' ) do
+        @options[:list] ||= false
+        opts.on('-l', '--list', 'List headers in document and exit') do
           @options[:list] = true
         end
-        @options[:pager] = true
+        @options[:pager] ||= true
         opts.on('-p', '--[no-]pager', 'Formatted output to pager (default on)') do |p|
           @options[:pager] = p
         end
@@ -84,12 +91,13 @@ module CLIMarkdown
           @options[:pager] = false
         end
-        @options[:section] = nil
-        opts.on('-s', '--section=NUMBER[,NUMBER]', 'Output only a headline-based section of the input (numeric from --list)') do |section|
+        @options[:section] ||= nil
+        opts.on('-s', '--section=NUMBER[,NUMBER]',
+                'Output only a headline-based section of the input (numeric from --list)') do |section|
           @options[:section] = section.split(/ *, */).map(&:strip).map(&:to_i)
         end
-        @options[:theme] = 'default'
+        @options[:theme] ||= 'default'
         opts.on('-t', '--theme=THEME_NAME', 'Specify an alternate color theme to load') do |theme|
           @options[:theme] = theme
         end
@@ -103,6 +111,12 @@ module CLIMarkdown
         opts.on('-w', '--width=COLUMNS', 'Column width to format for (default: terminal width)') do |columns|
           @options[:width] = columns.to_i
         end
+        @options[:inline_footnotes] ||= false
+        opts.on('--[no-]inline_footnotes',
+                'Display footnotes immediately after the paragraph that references them') do |p|
+          @options[:inline_footnotes] = p
+        end
       end
       begin
@@ -112,8 +126,19 @@ module CLIMarkdown
         exit 1
       end
+      unless File.exist?(config)
+        FileUtils.mkdir_p(File.dirname(config))
+        File.open(config, 'w') do |f|
+          opts = @options.dup
+          opts.delete(:list)
+          opts.delete(:section)
+          f.puts YAML.dump(opts)
+          warn "Config file saved to #{config}"
+        end
+      end
       @theme = load_theme(@options[:theme])
-      @cols = @options[:width]
+      @cols = @options[:width] - 2
       @output = ''
       @headers = []
       @setheaders = []
@@ -122,11 +147,32 @@ module CLIMarkdown
       @ref_links = {}
       @footnotes = {}
+      renderer = Redcarpet::Render::Console.new
+      renderer.theme = @theme
+      renderer.cols = @cols
+      renderer.log = @log
+      renderer.options = @options
+      markdown = Redcarpet::Markdown.new(renderer,
+                                         autolink: true,
+                                         fenced_code_blocks: true,
+                                         footnotes: true,
+                                         hard_wrap: false,
+                                         highlight: true,
+                                         lax_spacing: true,
+                                         quote: false,
+                                         space_after_headers: false,
+                                         strikethrough: true,
+                                         superscript: true,
+                                         tables: true,
+                                         underline: false)
       if !args.empty?
         files = args.delete_if { |f| !File.exist?(f) }
         files.each do |file|
           @log.info(%(Processing "#{file}"))
           @file = file
+          renderer.file = @file
           begin
             input = IO.read(file).force_encoding('utf-8')
           rescue StandardError
@@ -137,7 +183,7 @@ module CLIMarkdown
             puts list_headers(input)
             Process.exit 0
           else
-            convert_markdown(input)
+            @output = markdown.render(input)
           end
         end
         printout
@@ -153,14 +199,13 @@ module CLIMarkdown
           puts list_headers(input)
           Process.exit 0
         else
-          convert_markdown(input)
+          @output = markdown.render(input)
         end
         printout
       else
         warn 'No input'
         Process.exit 1
       end
     end
     def color(key)
@@ -182,7 +227,7 @@ module CLIMarkdown
       end
       if val.is_a? String
         val = "x #{val}"
-        res = val.split(/ /).map { |k| k.to_sym }
+        res = val.split(/ /).map(&:to_sym)
         c(res)
       else
         c([:reset])
@@ -194,7 +239,7 @@ module CLIMarkdown
         @headers = []
         headers = input.scan(/^((?!#!)(\#{1,6})\s*([^#]+?)(?: #+)?\s*|(\S.+)\n([=-]+))$/i)
-        headers.each {|h|
+        headers.each do |h|
           hlevel = 6
           title = nil
           if h[4] =~ /=+/
@@ -208,209 +253,92 @@ module CLIMarkdown
             title = h[2]
           end
           @headers << [
-            '#'*hlevel,
+            '#' * hlevel,
             title,
             h[0]
           ]
-        }
+        end
       end
       @headers
     end
     def list_headers(input)
       h_adjust = highest_header(input) - 1
-      input.gsub!(/^(#+)/) do |m|
-        match = Regexp.last_match
-        new_level = match[1].length - h_adjust
-        if new_level > 0
-          "#" * new_level
-        else
-          ''
-        end
+      input.gsub!(/^(#+)/) do
+        m = Regexp.last_match
+        new_level = m[1].length - h_adjust
+        new_level.positive? ? '#' * new_level : ''
       end
       @headers = get_headers(input)
       last_level = 0
       headers_out = []
-      @headers.each_with_index do |h,idx|
+      @headers.each_with_index do |h, idx|
         level = h[0].length - 1
         title = h[1]
-        if level - 1 > last_level
-          level = last_level + 1
-        end
+        level = last_level + 1 if level - 1 > last_level
         last_level = level
         subdoc = case level
-        when 0
-          ''
-        when 1
-          '- '
-        when 2
-          '+ '
-        when 3
-          '* '
-        else
-          '  '
-        end
-        headers_out.push ('%3d: %s' % [idx + 1, c(%i[x black])+"."*level+c(%i[x yellow])+subdoc+title.strip+xc])
+                 when 0
+                   ''
+                 when 1
+                   '- '
+                 when 2
+                   '+ '
+                 when 3
+                   '* '
+                 else
+                   '  '
+                 end
+        headers_out.push format('%<d>d: %<s>s',
+                                d: idx + 1,
+                                s: "#{c(%i[x black])}#{'.' * level}#{c(%i[x yellow])}#{subdoc}#{title.strip}#{xc}")
       end
-      return headers_out.join("\n")
+      headers_out.join("\n")
     end
     def highest_header(input)
       @headers = get_headers(input)
       top = 6
-      @headers.each {|h|
-        top = h[0].length if h[0].length < top
-      }
+      @headers.each { |h| top = h[0].length if h[0].length < top }
       top
     end
-    def color_table(input)
-      first = true
-      input.split(/\n/).map{|line|
-        if first
-          if line =~ /^\+-+/
-            line.gsub!(/^/, color('table border'))
-          else
-            first = false
-            line.gsub!(/\|/, "#{color('table border')}|#{color('table header')}")
-          end
-        elsif line.strip =~ /^[|:\- +]+$/
-          line.gsub!(/^(.*)$/, "#{color('table border')}\\1#{color('table color')}")
-          line.gsub!(/([:\-+]+)/,"#{color('table divider')}\\1#{color('table border')}")
-        else
-          line.gsub!(/\|/, "#{color('table border')}|#{color('table color')}")
-        end
-      }.join("\n")
-    end
-    def cleanup_tables(input)
-      in_table = false
-      header_row = false
-      all_content = []
-      this_table = []
-      orig_table = []
-      input.split(/\n/).each {|line|
-        if line =~ /(\|.*?)+/ && line !~ /^\s*~/
-          in_table = true
-          table_line = line.to_s.uncolor.strip.sub(/^\|?\s*/,'|').gsub(/\s*([\|:])\s*/,'\1')
-          if table_line.strip.gsub(/[\|:\- ]/,'') == ''
-            header_row = true
-          end
-          this_table.push(table_line)
-          orig_table.push(line)
-        else
-          if in_table
-            if this_table.length > 2
-              # if there's no header row, add one, cleanup requires it
-              unless header_row
-                cells = this_table[0].sub(/^\|/,'').scan(/.*?\|/).length
-                cell_row = '|' + ':-----|'*cells
-                this_table.insert(1, cell_row)
-              end
-              table = this_table.join("\n").strip
-              begin
-                formatted = MDTableCleanup.new(table)
-                res = formatted.to_md
-                res = color_table(res)
-              rescue
-                res = orig_table.join("\n")
-              end
-              all_content.push(res)
-            else
-              all_content.push(orig_table.join("\n"))
-            end
-            this_table = []
-            orig_table = []
-          end
-          in_table = false
-          header_row = false
-          all_content.push(line)
-        end
-      }
-      all_content.join("\n")
-    end
     def clean_markers(input)
-      input.gsub!(/^(\e\[[\d;]+m)?[%~] ?/,'\1')
-      input.gsub!(/^(\e\[[\d;]+m)*>(\e\[[\d;]+m)?( +)/,' \3\1\2')
-      input.gsub!(/^(\e\[[\d;]+m)*>(\e\[[\d;]+m)?/,'\1\2')
-      input.gsub!(/(\e\[[\d;]+m)?@@@(\e\[[\d;]+m)?$/,'')
+      input.gsub!(/^(\e\[[\d;]+m)?[%~] ?/, '\1')
+      input.gsub!(/^(\e\[[\d;]+m)*>(\e\[[\d;]+m)?( +)/, ' \3\1\2')
+      input.gsub!(/^(\e\[[\d;]+m)*>(\e\[[\d;]+m)?/, '\1\2')
+      input.gsub!(/(\e\[[\d;]+m)?@@@(\e\[[\d;]+m)?$/, '')
       input
     end
     def update_inline_links(input)
       links = {}
       counter = 1
-      input.gsub!(/(?<=\])\((.*?)\)/) do |m|
-        links[counter] = $1.uncolor
+      input.gsub!(/(?<=\])\((.*?)\)/) do
+        links[counter] = Regexp.last_match(1).uncolor
         "[#{counter}]"
       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
+      if colors.size&.positive?
         colors[-1]
       else
         nullable ? nil : xc
       end
     end
-    def color_link(line, text, url)
-      [
-        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/,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)
-      lexers = %w(Clipper XBase Cucumber cucumber Gherkin gherkin RobotFramework robotframework abap ada ada95ada2005 ahk antlr-as antlr-actionscript antlr-cpp antlr-csharp antlr-c# antlr-java antlr-objc antlr-perl antlr-python antlr-ruby antlr-rb antlr apacheconf aconf apache applescript as actionscript as3 actionscript3 aspectj aspx-cs aspx-vb asy asymptote autoit Autoit awk gawk mawk nawk basemake bash sh ksh bat bbcode befunge blitzmax bmax boo brainfuck bf bro bugs winbugs openbugs c-objdump c ca65 cbmbas ceylon cfengine3 cf3 cfm cfs cheetah spitfire clojure clj cmake cobol cobolfree coffee-script coffeescript common-lisp cl console control coq cpp c++ cpp-objdump c++-objdumb cxx-objdump croc csharp c# css+django css+jinja css+erb css+ruby css+genshitext css+genshi css+lasso css+mako css+myghty css+php css+smarty css cuda cu cython pyx d-objdump d dart delphi pas pascal objectpascal dg diff udiff django jinja dpatch dtd duel Duel Engine Duel View JBST jbst JsonML+BST dylan-console dylan-repl dylan-lid lid dylan ec ecl elixir ex exs erb erl erlang evoque factor fan fancy fy felix flx fortran fsharp gas genshi kid xml+genshi xml+kid genshitext glsl gnuplot go gooddata-cl gosu groff nroff man groovy gst haml HAML haskell hs haxeml hxml html+cheetah html+spitfire html+django html+jinja html+evoque html+genshi html+kid html+lasso html+mako html+myghty html+php html+smarty html+velocity html http hx haXe hybris hy idl iex ini cfg io ioke ik irc jade JADE jags java jlcon js+cheetah javascript+cheetah js+spitfire javascript+spitfire js+django javascript+django js+jinja javascript+jinja js+erb javascript+erb js+ruby javascript+ruby js+genshitext js+genshi javascript+genshitext javascript+genshi js+lasso javascript+lasso js+mako javascript+mako js+myghty javascript+myghty js+php javascript+php js+smarty javascript+smarty js javascript json jsp julia jl kconfig menuconfig linux-config kernel-config koka kotlin lasso lassoscript lhs literate-haskell lighty lighttpd live-script livescript llvm logos logtalk lua make makefile mf bsdmake mako maql mason matlab matlabsession minid modelica modula2 m2 monkey moocode moon moonscript mscgen msc mupad mxml myghty mysql nasm nemerle newlisp newspeak nginx nimrod nim nsis nsi nsh numpy objdump objective-c++ objectivec++ obj-c++ objc++ objective-c objectivec obj-c objc objective-j objectivej obj-j objj ocaml octave ooc opa openedge abl progress perl pl php php3 php4 php5 plpgsql postgresql postgres postscript pot po pov powershell posh ps1 prolog properties protobuf psql postgresql-console postgres-console puppet py3tb pycon pypylog pypy pytb python py sage python3 py3 qml Qt Meta Language Qt modeling Language racket rkt ragel-c ragel-cpp ragel-d ragel-em ragel-java ragel-objc ragel-ruby ragel-rb ragel raw rb ruby duby rbcon irb rconsole rout rd rebol redcode registry rhtml html+erb html+ruby rst rest restructuredtext rust sass SASS scala scaml SCAML scheme scm scilab scss shell-session smali smalltalk squeak smarty sml snobol sourceslist sources.list sp spec splus s r sql sqlite3 squidconf squid.conf squid ssp stan systemverilog sv tcl tcsh csh tea tex latex text trac-wiki moin treetop ts urbiscript vala vapi vb.net vbnet velocity verilog v vgl vhdl vim xml+cheetah xml+spitfire xml+django xml+jinja xml+erb xml+ruby xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+smarty xml+velocity xml xquery xqy xq xql xqm xslt xtend yaml)
-      return lexers.include? language.strip
-    end
-    def pad_max(block,eol='')
-      block.split(/\n/).map { |l|
+    def pad_max(block, eol='')
+      block.split(/\n/).map do |l|
         new_code_line = l.gsub(/\t/, '    ')
         orig_length = new_code_line.size + 8 + eol.size
         pad_count = [@cols - orig_length, 0].max
@@ -418,539 +346,9 @@ module CLIMarkdown
         [
           new_code_line,
           eol,
-          ' ' * ([pad_count-1,0].max)
+          ' ' * [pad_count - 1, 0].max
         ].join
-      }.join("\n")
-    end
-    def hiliteCode(language, codeBlock, leader, first_indent, block)
-      new_indent = first_indent > 0 ? first_indent + 2 : 0
-      last_indent = first_indent == 0 ? 7 : 5
-      if exec_available('pygmentize') && language && valid_lexer?(language)
-        lexer = "-l #{language}"
-        begin
-          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}/,'')
-              [
-                "> ",
-                color('code_block marker'),
-                " "*first_indent,
-                "#{color('code_block bg')}#{l}"
-              ].join
-            }.join("\n").blackout(@theme['code_block']['bg']) + "#{xc}\n"
-          end
-        rescue => e
-          @log.error(e)
-          hilite = block
-        end
-      else
-        hilite = codeBlock.split(/\n/).map do |line|
-          new_code_line = line.gsub(/\t/, '    ')
-          new_code_line.sub!(/^#{" "*first_indent}/,'')
-          new_code_line.gsub!(/ /, "#{color('code_block color')} ")
-          [
-            "> ",
-            color('code_block marker'),
-            " "*first_indent,
-            color('code_block color'),
-            new_code_line,
-            xc
-          ].join
-        end.join("\n")
-      end
-      [
-        xc,
-        "\n",
-        " "*first_indent,
-        color('code_block border'),
-        '--[ ',
-        color('code_block title'),
-        leader.chomp,
-        color('code_block border'),
-        ' ]',
-        '-'*(@cols-new_indent-leader.size-2),
-        xc,
-        "\n",
-        hilite.chomp,
-        "\n",
-        " "*(new_indent),
-        color('code_block border'),
-        '-'*(@cols-new_indent),
-        xc,
-        "\n"
-      ].join
-    end
-    def convert_markdown(input)
-      ## Replace setex headers with ATX
-      input.gsub!(/^([^\n]+)\n={3,}\s*$/m, "# \\1\n")
-      input.gsub!(/^([^\n]+?)\n-{3,}\s*$/m, "## \\1\n")
-      @headers = get_headers(input)
-      input += "\n\n@@@"
-      # yaml/MMD headers
-      in_yaml = false
-      if input.split("\n")[0] =~ /(?i-m)^---[ \t]*?(\n|$)/
-        @log.info("Found YAML")
-        # YAML
-        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 = color('metadata marker') + "%% " + color('metadata border') + line
-            else
-              line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-              line = color('metadata marker') + "%% " + color('metadata color') + line
-            end
-            if @cols - line.uncolor.size > 0
-              line += " "*(@cols-line.uncolor.size)
-            end
-          }.join("\n") + "#{xc}\n"
-        end
-      end
-      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|
-          mmd.split(/\n/).map {|line|
-            line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-            line = color('metadata marker') + "%% " + color('metadata color') + line
-            if @cols - line.uncolor.size > 0
-              line += " "*(@cols - line.uncolor.size)
-            end
-          }.join("\n") + " "*@cols + "#{xc}\n"
-        end
-      end
-      # Gather reference links
-      input.gsub!(/^\s{,3}(?<![\e*])\[\b(.+)\b\]: +(.+)/) do |m|
-        match = Regexp.last_match
-        @ref_links[match[1]] = match[2]
-        ''
-      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
-        ''
-      end
-      if @options[:section]
-        new_content = []
-        @options[:section].each do |sect|
-          in_section = false
-          top_level = 1
-          input.split(/\n/).each do |graf|
-            if graf =~ /^(#+) *(.*?)( *#+)?$/
-              m = Regexp.last_match
-              level = m[1].length
-              title = m[2]
-              if in_section
-                if level >= top_level
-                  new_content.push(graf)
-                else
-                  in_section = false
-                  break
-                end
-              elsif title.downcase == @headers[sect - 1][1].downcase
-                in_section = true
-                top_level = level + 1
-                new_content.push(graf)
-              else
-                next
-              end
-            elsif in_section
-              new_content.push(graf)
-            end
-          end
-        end
-        input = new_content.join("\n")
-      end
-      # fenced code block parsing
-      input.gsub!(/(?i-m)(^[ \t]*[`~]{3,})([\s\S]*?)\n([\s\S]*?)\1/m) do
-        language = nil
-        m = Regexp.last_match
-        first_indent = m[1].gsub(/\t/, '    ').match(/^ */)[0].size
-        if m[2] && !m[2].strip.empty?
-          language = m[2].strip.split(/ /)[0]
-          code_block = pad_max(m[3].to_s, '')
-          leader = language || 'code'
-        else
-          first_line = m[3].to_s.split(/\n/)[0]
-          if first_line =~ %r{^\s*#!.*/.+}
-            shebang = first_line.match(%r{^\s*#!.*/(?:env )?([^/]+)$})
-            language = shebang[1]
-            code_block = m[3]
-            leader = shebang[1] || 'code'
-          else
-            code_block = pad_max(m[3].to_s, "#{color('code_block eol')}¬")
-            leader = language || 'code'
-          end
-        end
-        leader += xc
-        hiliteCode(language, code_block, leader, first_indent, m[0])
-      end
-      # h_adjust = highest_header(input) - 1
-      # input.gsub!(/^(#+)/) do |m|
-      #   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
-      }
-      # remove empty links
-      input.gsub!(/\[(.*?)\]\(\s*?\)/, '\1')
-      input.gsub!(/\[(.*?)\]\[\]/, '[\1][\1]')
-      lines = input.split(/\n/)
-      # previous_indent = 0
-      lines.map!.with_index do |aLine, i|
-        line = aLine.dup
-        clean_line = line.dup.uncolor
-        if clean_line.uncolor =~ /(^[%~])/ # || clean_line.uncolor =~ /^( {4,}|\t+)/
-          ## TODO: find indented code blocks and prevent highlighting
-          ## Needs to miss block indented 1 level in lists
-          ## Needs to catch lists in code
-          ## Needs to avoid within fenced code blocks
-          # if line =~ /^([ \t]+)([^*-+]+)/
-          #   indent = $1.gsub(/\t/, "    ").size
-          #   if indent >= previous_indent
-          #     line = "~" + line
-          #   end
-          #   p [indent, previous_indent]
-          #   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)*\]/
-            match = Regexp.last_match
-            key = match[1].uncolor
-            if @footnotes.key? key
-              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
-          # color footnote references
-          line.gsub!(/\[\^(\S+)\]/) do |m|
-            match = Regexp.last_match
-            last = find_color(match.pre_match, true)
-            counter = i
-            while last.nil? && counter > 0
-              counter -= 1
-              find_color(lines[counter])
-            end
-            "#{color('footnote brackets')}[#{color('footnote caret')}^#{color('footnote title')}#{match[1]}#{color('footnote brackets')}]" + (last ? last : xc)
-          end
-          # blockquotes
-          line.gsub!(/^(\s*>)+( .*?)?$/) do |m|
-            match = Regexp.last_match
-            last = find_color(match.pre_match, true)
-            counter = i
-            while last.nil? && counter > 0
-              counter -= 1
-              find_color(lines[counter])
-            end
-            "#{c(%i[b black])}#{match[1]}#{c(%i[x magenta])} #{match[2]}" + (last ? last : xc)
-          end
-          # make reference links inline
-          line.gsub!(/(?<![\e*])\[(\b.*?\b)?\]\[(\b.+?\b)?\]/) do |m|
-            match = Regexp.last_match
-            title = match[2] || ''
-            text = match[1] || ''
-            if match[2] && @ref_links.key?(title.downcase)
-              "[#{text}](#{@ref_links[title]})"
-            elsif match[1] && @ref_links.key?(text.downcase)
-              "[#{text}](#{@ref_links[text]})"
-            else
-              if input.match(/^#+\s*#{Regexp.escape(text)}/i)
-                "[#{text}](##{text})"
-              else
-                match[1]
-              end
-            end
-          end
-          # color inline links
-          line.gsub!(/(?<![\e*!])\[(\S.*?\S)\]\((\S.+?\S)\)/) do |m|
-            match = Regexp.last_match
-            color_link(match.pre_match, match[1], match[2])
-          end
-          # horizontal rules
-          line.gsub!(/^ {,3}([\-*] ?){3,}$/) do |m|
-            color('hr color') + '_'*@cols + xc
-          end
-          # escaped characters
-          line.gsub!(/\\(\S)/,'\1')
-          # bold, bold/italic
-          line.gsub!(/(?<pre>^|[ "'\(“])(?<open>[\*_]{2,3})(?<content>[^\*_\s][^\*_]+?[^\*_\s])[\*_]{2,3}/) do |m|
-            match = Regexp.last_match
-            last = find_color(match.pre_match, true)
-            counter = i
-            while last.nil? && counter > 0
-              counter -= 1
-              last = find_color(lines[counter])
-            end
-            emph = match['open'].length == 2 ? color('emphasis bold') : color('emphasis bold-italic')
-            "#{match['pre']}#{emph}#{match['content']}" + (last ? last : xc)
-          end
-          # italic
-          line.gsub!(/(?<pre>^|[ "'\(“])[\*_](?<content>[^\*_\s][^\*_]+?[^\*_\s])[\*_]/) do |m|
-            match = Regexp.last_match
-            last = find_color(match.pre_match, true)
-            counter = i
-            while last.nil? && counter > 0
-              counter -= 1
-              last = find_color(lines[counter])
-            end
-            "#{match['pre']}#{color('emphasis italic')}#{match[2]}" + (last ? last : xc)
-          end
-          # equations
-          line.gsub!(/((\\\\\[|\$\$)(.*?)(\\\\\]|\$\$)|(\\\\\(|\$)(.*?)(\\\\\)|\$))/) do |m|
-            match = Regexp.last_match
-            last = find_color(match.pre_match)
-            if match[2]
-              brackets = [match[2], match[4]]
-              equat = match[3]
-            else
-              brackets = [match[5], match[7]]
-              equat = match[6]
-            end
-            "#{c(%i[b black])}#{brackets[0]}#{xc}#{c(%i[b blue])}#{equat}#{c(%i[b black])}#{brackets[1]}" + (last ? last : xc)
-          end
-          # misc html
-          line.gsub!(%r{<br/?>}, "\n")
-          line.gsub!(%r{(?i-m)((</?)(\w+[\s\S]*?)(>))}) do
-            match = Regexp.last_match
-            last = find_color(match.pre_match)
-            [
-              color('html brackets'),
-              match[2],
-              color('html color'),
-              match[3],
-              color('html brackets'),
-              match[4],
-              last || xc
-            ].join
-          end
-          # inline code spans
-          line.gsub!(/`(.*?)`/) do
-            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 || 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")
-      # images
-      input.gsub!(/^(.*?)!\[(.*)?\]\((.*?\.(?:png|gif|jpg))( +.*)?\)/) do
-        match = Regexp.last_match
-        if match[1].uncolor =~ /^( {4,}|\t)+/
-          match[0]
-        else
-          tail = match[4].nil? ? '' : " "+match[4].strip
-          result = nil
-          if (exec_available('imgcat') || exec_available('chafa')) && @options[:local_images]
-            if match[3]
-              img_path = match[3]
-              if img_path =~ /^http/ && @options[:remote_images]
-                if exec_available('chafa')
-                  if File.directory?('.mdless_tmp')
-                    FileUtils.rm_r '.mdless_tmp', force: true
-                  end
-                  Dir.mkdir('.mdless_tmp')
-                  Dir.chdir('.mdless_tmp')
-                  `curl -SsO #{img_path} 2> /dev/null`
-                  tmp_img = File.basename(img_path)
-                  img = `chafa "#{tmp_img}"`
-                  pre = match[2].size > 0 ? "    #{c(%i[d blue])}[#{match[2].strip}]\n" : ''
-                  post = tail.size > 0 ? "\n    #{c(%i[b blue])}-- #{tail} --" : ''
-                  result = pre + img + post
-                  Dir.chdir('..')
-                  FileUtils.rm_r '.mdless_tmp', force: true
-                else
-                  if exec_available('imgcat')
-                    begin
-                      res, s = Open3.capture2(%Q{curl -sS "#{img_path}" 2> /dev/null | imgcat})
-                      if s.success?
-                        pre = match[2].size > 0 ? "    #{c(%i[d blue])}[#{match[2].strip}]\n" : ''
-                        post = tail.size > 0 ? "\n    #{c(%i[b blue])}-- #{tail} --" : ''
-                        result = pre + res + post
-                      end
-                    rescue => e
-                      @log.error(e)
-                    end
-                  else
-                    @log.warn('No viewer for remote images')
-                  end
-                end
-              else
-                if img_path =~ %r{^[~/]}
-                  img_path = File.expand_path(img_path)
-                elsif @file
-                  base = File.expand_path(File.dirname(@file))
-                  img_path = File.join(base, img_path)
-                end
-                if File.exist?(img_path)
-                  pre = !match[2].empty? ? "    #{c(%i[d blue])}[#{match[2].strip}]\n" : ''
-                  post = !tail.empty? ? "\n    #{c(%i[b blue])}-- #{tail} --" : ''
-                  if exec_available('chafa')
-                    img = `chafa "#{img_path}"`
-                  elsif exec_available('imgcat')
-                    img = `imgcat "#{img_path}"`
-                  end
-                  result = pre + img + post
-                end
-              end
-            end
-          end
-          if result.nil?
-            match[1] + color_image(match.pre_match, match[2], match[3] + tail) + xc
-          else
-            match[1] + result + xc
-          end
-        end
-      end
-      @footnotes.each do |t, v|
-        input += [
-          "\n\n",
-          color('footnote brackets'),
-          '[',
-          color('footnote caret'),
-          '^',
-          color('footnote title'),
-          t,
-          color('footnote brackets'),
-          ']: ',
-          color('footnote note'),
-          v,
-          xc
-        ].join
-      end
-      @output += input
-    end
-    def exec_available(cli)
-      if File.exist?(File.expand_path(cli))
-        File.executable?(File.expand_path(cli))
-      else
-        system "which #{cli}", out: File::NULL, err: File::NULL
-      end
+      end.join("\n")
     end
     def page(text, &callback)
@@ -989,40 +387,37 @@ module CLIMarkdown
     end
     def printout
-      out = @output.rstrip.split(/\n/).map {|p|
+      out = @output.rstrip.split(/\n/).map do |p|
         p.wrap(@cols, color('text'))
-      }.join("\n")
+      end.join("\n")
-      unless out && out.size > 0
-        @log.warn "No results"
+      unless out.size&.positive?
+        @log.warn 'No results'
         Process.exit
       end
-      out = cleanup_tables(out)
       out = clean_markers(out)
-      out = out.gsub(/\n{2,}/m,"\n\n") + "#{xc}"
+      out = "#{out.gsub(/\n{2,}/m, "\n\n")}#{xc}"
-      unless @options[:color]
-        out.uncolor!
-      end
+      out.uncolor! unless @options[:color]
       if @options[:pager]
         page(out)
       else
-        $stdout.print (out.rstrip)
+        $stdout.print out.rstrip
       end
     end
     def which_pager
-      pagers = [ENV['PAGER'], ENV['GIT_PAGER']]
+      # pagers = [ENV['PAGER'], ENV['GIT_PAGER']]
+      pagers = [ENV['PAGER']]
-      if exec_available('git')
-        git_pager = `git config --get-all core.pager || true`.split.first
-        git_pager && pagers.push(git_pager)
-      end
+      # if exec_available('git')
+      #   git_pager = `git config --get-all core.pager || true`.split.first
+      #   git_pager && pagers.push(git_pager)
+      # end
-      pagers.concat(['bat', 'less', 'more', 'cat', 'pager'])
+      pagers.concat(['less', 'more', 'cat', 'pager'])
       pagers.select! do |f|
         if f
@@ -1032,7 +427,7 @@ module CLIMarkdown
             @log.warn('most not allowed as pager')
             false
           else
-            system "which #{f}", :out => File::NULL, :err => File::NULL
+            system "which #{f}", out: File::NULL, err: File::NULL
           end
         else
           false
@@ -1041,21 +436,25 @@ module CLIMarkdown
       pg = pagers.first
       args = case pg
-      when 'delta'
-        ' --pager="less -Xr"'
-      when 'less'
-        ' -Xr'
-      when 'bat'
-        ' -p --pager="less -Xr"'
-      else
-        ''
-      end
+             # when 'delta'
+             #   ' --pager="less -Xr"'
+             when 'less'
+               ' -Xr'
+             # when 'bat'
+             #   ' -p --pager="less -Xr"'
+             else
+               ''
+             end
       [pg, args]
     end
-    def xc
-      color('text')
+    def exec_available(cli)
+      if File.exist?(File.expand_path(cli))
+        File.executable?(File.expand_path(cli))
+      else
+        system "which #{cli}", out: File::NULL, err: File::NULL
+      end
     end
   end
 end

data/lib/mdless/tables.rb CHANGED Viewed

@@ -1,16 +1,15 @@
 module CLIMarkdown
   class MDTableCleanup
-    PAD_CHAR = '⎕'
+    PAD_CHAR = "\u00A0"
     def initialize(input)
       @string = input
-      @format_row = []
     end
     def parse
+      @format_row = []
       @table = []
-      format = []
+      fmt = []
       cols = 0
       rows = @string.split(/\r?\n/)
       rows.each do |row|
@@ -19,29 +18,29 @@ module CLIMarkdown
         row_array = row.split(/\|/)
         row_array.map! { |cell| cell.strip }
         if row =~ /^[\|:\- ]+$/
-          format = row_array
+          fmt = row_array
         else
           @table.push row_array
         end
         cols = row_array.length if row_array.length > cols
       end
-      format.each_with_index {|cell, i|
+      fmt.each_with_index do |cell, i|
         cell.strip!
-        f = 'left'
-        if cell =~ /^:.*?:$/
-          f = 'center'
-        elsif cell =~ /[^:]+:$/
-          f = 'right'
+        f = case cell
+        when /^:.*?:$/
+          :center
+        when /[^:]+:$/
+          :right
         else
-          f = 'just'
+          :just
         end
         @format_row.push(f)
-      }
+      end
       if @format_row.length < cols
         (cols - @format_row.length).times do
-          @format_row.push('left')
+          @format_row.push(:left)
         end
       end
@@ -60,9 +59,9 @@ module CLIMarkdown
       @table ||= parse
     end
-    def column_width(i)
+    def column_width(idx)
       @widths ||= column_widths
-      @widths[i]
+      @widths[idx]
     end
     def column_widths
@@ -72,7 +71,7 @@ module CLIMarkdown
       end
       table.each do |row|
-        @format_row.each_with_index do |cell, i|
+        @format_row.each_with_index do |_, i|
           length = row[i].strip.length
           @widths[i] = length if length > @widths[i]
         end
@@ -81,32 +80,31 @@ module CLIMarkdown
       @widths
     end
-    def pad(string,type,length)
-      string.strip!
-      if type == 'center'
-        string.center(length, PAD_CHAR)
-      elsif type == 'right'
-        string.rjust(length, PAD_CHAR)
-      elsif type == 'left'
-        string.ljust(length, PAD_CHAR)
+    def pad(string, alignment, length)
+      case alignment
+      when :center
+        string.strip.center(length, PAD_CHAR)
+      when :right
+        string.strip.rjust(length, PAD_CHAR)
+      when :left
+        string.strip.ljust(length, PAD_CHAR)
       else
-        string.ljust(length, PAD_CHAR)
+        string.strip.ljust(length, PAD_CHAR)
       end
     end
     def separator(length, alignment)
-      out = "".ljust(length,'-')
+      out = ''.ljust(length, '-')
       case alignment
-      when 'left'
-        out = ':' + out + '-'
-      when 'right'
-        out = '-' + out + ':'
-      when 'center'
-        out = ":#{out}:"
+      when :left
+        ":#{out}-"
+      when :right
+        "-#{out}:"
+      when :center
+        ":#{out}:"
       else
-        out = "-#{out}-"
+        "-#{out}-"
       end
-      out
     end
     def header_separator_row
@@ -128,18 +126,14 @@ module CLIMarkdown
     def to_md
       output = []
       t = table.clone
-      t.each_with_index do |row, index|
-        row.map!.with_index { |cell, i| cell = pad(cell, @format_row[i], column_width(i)) }
-        output.push("| #{row.join(' | ').lstrip} |")
+      t.each do |row|
+        new_row = row.map.with_index { |cell, i| pad(cell, @format_row[i], column_width(i)) }.join(' | ')
+        output.push("| #{new_row} |")
       end
       output.insert(1, header_separator_row)
       output.insert(0, table_border)
       output.push(table_border)
-      output.join("\n").gsub(/((?<=\| )#{PAD_CHAR}+|#{PAD_CHAR}+(?= \|))/) {|m|
-        " "*m.length
-      }
+      output.join("\n")
     end
   end
 end

data/lib/mdless/theme.rb CHANGED Viewed

@@ -70,6 +70,7 @@ module CLIMarkdown
         'pygments_theme' => 'monokai'
       },
       'dd' => {
+        'term' => 'black on_white',
         'marker' => 'd red',
         'color' => 'b white'
       },
@@ -86,7 +87,9 @@ module CLIMarkdown
       'html' => {
         'brackets' => 'd yellow on_black',
         'color' => 'yellow on_black'
-      }
+      },
+      'super' => 'b green',
+      'text' => 'white'
     }
     def load_theme_file(theme_file)

data/lib/mdless/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.37'
+  VERSION = '2.0.1'
 end

data/lib/mdless.rb CHANGED Viewed

@@ -3,11 +3,14 @@ require 'shellwords'
 require 'open3'
 require 'fileutils'
 require 'logger'
+require 'tty-which'
 require 'mdless/version.rb'
 require 'mdless/colors'
 require 'mdless/tables'
 require 'mdless/hash'
 require 'mdless/theme'
+require 'redcarpet'
+require 'mdless/console'
 require 'mdless/converter'
 module CLIMarkdown

metadata CHANGED Viewed

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 2.0.1
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: tty-which
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement