mdless 2.1.44 → 2.1.46

data/lib/mdless/console.rb

@@ -24,7 +24,7 @@ module Redcarpet
       end
 
       def xc
-        x + color('text')
+        x + color("text")
       end
 
       def x
@@ -36,16 +36,16 @@ module Redcarpet
         input.split(/\n/).map do |line|
           if first
             if line =~ /^\+-+/
-              line.gsub!(/^/, color('table border'))
+              line.gsub!(/^/, color("table border"))
             else
               first = false
-              line.gsub!(/\|/, "#{color('table border')}|#{color('table header')}")
+              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')}")
+            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')}")
+            line.gsub!(/\|/, "#{color("table border")}|#{color("table color")}")
           end
         end.join("\n")
       end
@@ -60,7 +60,7 @@ module Redcarpet
 
       def code_bg(input, width)
         input.split(/\n/).map do |line|
-          tail = line.uncolor.length < width ? "\u00A0" * (width - line.uncolor.length) : ''
+          tail = line.uncolor.length < width ? "\u00A0" * (width - line.uncolor.length) : ""
           "#{x}#{line}#{tail}#{x}"
         end.join("\n")
       end
@@ -96,41 +96,40 @@ module Redcarpet
         #   end.join("\n").blackout(MDLess.theme['code_block']['bg']) + "#{xc}\n"
         # end
 
-        if MDLess.options[:syntax_higlight] && !exec_available('pygmentize')
-          MDLess.log.error('Syntax highlighting requested by pygmentize is not available')
+        if MDLess.options[:syntax_higlight] && !exec_available("pygmentize")
+          MDLess.log.error("Syntax highlighting requested by pygmentize is not available")
           MDLess.options[:syntax_higlight] = false
         end
 
         if MDLess.options[:syntax_higlight]
-          pyg = TTY::Which.which('pygmentize')
-          lexer = language&.valid_lexer? ? "-l #{language}" : '-g'
+          pyg = TTY::Which.which("pygmentize")
+          lexer = language&.valid_lexer? ? "-l #{language}" : "-g"
           begin
-            pygments_theme = MDLess.options[:pygments_theme] || MDLess.theme['code_block']['pygments_theme']
+            pygments_theme = MDLess.options[:pygments_theme] || MDLess.theme["code_block"]["pygments_theme"]
 
             unless pygments_theme.valid_pygments_theme?
               MDLess.log.error("Invalid Pygments theme #{pygments_theme}, defaulting to 'default' for highlighting")
-              pygments_theme = 'default'
+              pygments_theme = "default"
             end
 
             cmd = [
               "#{pyg} -f terminal256",
               "-O style=#{pygments_theme}",
               lexer,
-              '2> /dev/null'
-            ].join(' ')
+              "2> /dev/null",
+            ].join(" ")
             hilite, s = Open3.capture2(cmd,
                                        stdin_data: code_block)
 
             if s.success?
               hilite = xc + hilite.split(/\n/).map do |l|
                 [
-                  color('code_block marker'),
-                  MDLess.theme['code_block']['character'],
-                  "#{color('code_block bg')}#{l}#{xc}"
+                  color("code_block marker"),
+                  MDLess.theme["code_block"]["character"],
+                  "#{color("code_block bg")}#{l}#{xc}",
                 ].join
-              end.join("\n").blackout(MDLess.theme['code_block']['bg']) + "#{xc}\n"
+              end.join("\n").blackout(MDLess.theme["code_block"]["bg"]) + "#{xc}\n"
             end
-
           rescue StandardError => e
             MDLess.log.error(e)
             hilite = code_block
@@ -138,32 +137,32 @@ module Redcarpet
         else
           hilite = code_block.split(/\n/).map do |line|
             [
-              color('code_block marker'),
-              MDLess.theme['code_block']['character'],
-              color('code_block color'),
+              color("code_block marker"),
+              MDLess.theme["code_block"]["character"],
+              color("code_block color"),
               line,
-              xc
+              xc,
             ].join
-          end.join("\n").blackout(MDLess.theme['code_block']['bg']) + "#{xc}\n"
+          end.join("\n").blackout(MDLess.theme["code_block"]["bg"]) + "#{xc}\n"
         end
 
         top_border = if language.nil? || language.empty?
-                       '-' * longest_line
-                     else
-                       "--[ #{language} ]#{'-' * (longest_line - 6 - language.length)}"
-                     end
+            "-" * longest_line
+          else
+            "--[ #{language} ]#{"-" * (longest_line - 6 - language.length)}"
+          end
         [
           xc,
-          color('code_block border'),
+          color("code_block border"),
           top_border,
           xc,
           "\n",
-          color('code_block color'),
+          color("code_block color"),
           code_bg(hilite.chomp, longest_line),
           "\n",
-          color('code_block border'),
-          '-' * longest_line,
-          xc
+          color("code_block border"),
+          "-" * longest_line,
+          xc,
         ].join
       end
 
@@ -200,56 +199,56 @@ module Redcarpet
 
       def block_quote(quote)
         ret = "\n\n"
-        quote.strip.wrap(MDLess.cols, color('blockquote color')).split(/\n/).each do |line|
+        quote.strip.wrap(MDLess.cols, color("blockquote color")).split(/\n/).each do |line|
           ret += [
-            color('blockquote marker color'),
-            MDLess.theme['blockquote']['marker']['character'],
-            color('blockquote color'),
-            ' ',
+            color("blockquote marker color"),
+            MDLess.theme["blockquote"]["marker"]["character"],
+            color("blockquote color"),
+            " ",
             line,
-            "\n"
-          ].join('')
+            "\n",
+          ].join("")
         end
         "#{ret}\n\n"
       end
 
       def block_html(raw_html)
-        "#{color('html color')}#{color_tags(raw_html)}#{xc}"
+        "#{color("html color")}#{color_tags(raw_html)}#{xc}"
       end
 
       def header(text, header_level)
-        pad = ''
-        ansi = ''
+        pad = ""
+        ansi = ""
         text.clean_header_ids!
-        uncolored = text.uncolor.gsub(/<<(pre|post)\d+>>/, '')
+        uncolored = text.uncolor.gsub(/<<(pre|post)\d+>>/, "")
         uncolored.sub!(/\[(.*?)\]\(.*?\)/, '[\1][xxx]') if MDLess.options[:links] != :inline
 
         text_length = uncolored.length
         case header_level
         when 1
-          ansi = color('h1 color')
-          pad = color('h1 pad')
-          char = MDLess.theme['h1']['pad_char'] || '='
+          ansi = color("h1 color")
+          pad = color("h1 pad")
+          char = MDLess.theme["h1"]["pad_char"] || "="
           pad += text_length + 2 > MDLess.cols ? char * text_length : char * (MDLess.cols - (text_length + 1))
         when 2
-          ansi = color('h2 color')
-          pad = color('h2 pad')
-          char = MDLess.theme['h2']['pad_char'] || '-'
+          ansi = color("h2 color")
+          pad = color("h2 pad")
+          char = MDLess.theme["h2"]["pad_char"] || "-"
           pad += text_length + 2 > MDLess.cols ? char * text_length : char * (MDLess.cols - (text_length + 1))
         when 3
-          ansi = color('h3 color')
+          ansi = color("h3 color")
         when 4
-          ansi = color('h4 color')
+          ansi = color("h4 color")
         when 5
-          ansi = color('h5 color')
+          ansi = color("h5 color")
         else
-          ansi = color('h6 color')
+          ansi = color("h6 color")
         end
 
         # If we're in iTerm and not paginating, add
         # iTerm Marks for navigation on h1-3
         if header_level < 4 &&
-           ENV['TERM_PROGRAM'] =~ /^iterm/i &&
+           ENV["TERM_PROGRAM"] =~ /^iterm/i &&
            MDLess.options[:pager] == false
           ansi = "\e]1337;SetMark\a#{ansi}"
         end
@@ -258,20 +257,20 @@ module Redcarpet
       end
 
       def hrule()
-        "\n\n#{color('hr color')}#{'_' * MDLess.cols}#{xc}\n\n"
+        "\n\n#{color("hr color")}#{"_" * MDLess.cols}#{xc}\n\n"
       end
 
       def paragraph(text)
         text.scrub!
         out = if MDLess.options[:preserve_linebreaks]
-                "#{xc}#{text.gsub(/ +/, ' ').strip}#{xc}#{x}\n\n"
-              else
-                if text.uncolor =~ / {2,}$/ || text.uncolor =~ /^%/
-                  "#{xc}#{text.gsub(/ +/, ' ').strip}#{xc}#{x}\n"
-                else
-                  "#{xc}#{text.gsub(/ +/, ' ').gsub(/\n+(?![:-])/, ' ').strip}#{xc}#{x}\n\n"
-                end
-              end
+            "#{xc}#{text.gsub(/ +/, " ").strip}#{xc}#{x}\n\n"
+          else
+            if text.uncolor =~ / {2,}$/ || text.uncolor =~ /^%/
+              "#{xc}#{text.gsub(/ +/, " ").strip}#{xc}#{x}\n"
+            else
+              "#{xc}#{text.gsub(/ +/, " ").gsub(/\n+(?![:-])/, " ").strip}#{xc}#{x}\n\n"
+            end
+          end
         if MDLess.options[:at_tags] || MDLess.options[:taskpaper]
           highlight_tags(out)
         else
@@ -280,7 +279,7 @@ module Redcarpet
       end
 
       def uncolor_grafs(text)
-        text.gsub(/#{Regexp.escape(color('text'))}/, color('list color'))
+        text.gsub(/#{Regexp.escape(color("text"))}/, color("list color"))
       end
 
       @table_cols = nil
@@ -289,15 +288,15 @@ module Redcarpet
         @header_row.map do |alignment|
           case alignment
           when :left
-            '|:---'
+            "|:---"
           when :right
-            '|---:'
+            "|---:"
           when :center
-            '|:--:'
+            "|:--:"
           else
-            '|----'
+            "|----"
           end
-        end.join('') + '|'
+        end.join("") + "|"
       end
 
       def table(header, body)
@@ -305,8 +304,8 @@ module Redcarpet
           "#{header}",
           table_header_row,
           "|\n",
-          "#{body}\n\n"
-        ].join(''))
+          "#{body}\n\n",
+        ].join(""))
         @header_row = []
         res = formatted.to_md
         "#{color_table(res)}\n\n"
@@ -329,71 +328,71 @@ module Redcarpet
       def autolink(link, _)
         [
           pre_element,
-          color('link brackets'),
-          '<',
-          color('link url'),
+          color("link brackets"),
+          "<",
+          color("link url"),
           link,
-          color('link brackets'),
-          '>',
+          color("link brackets"),
+          ">",
           xc,
-          post_element
-        ].join('')
+          post_element,
+        ].join("")
       end
 
       def codespan(code)
         out = [
           pre_element,
-          color('code_span marker'),
-          MDLess.theme['code_span']['character'],
-          color('code_span color'),
+          color("code_span marker"),
+          MDLess.theme["code_span"]["character"],
+          color("code_span color"),
           code,
-          color('code_span marker'),
-          MDLess.theme['code_span']['character'],
+          color("code_span marker"),
+          MDLess.theme["code_span"]["character"],
           xc,
-          post_element
+          post_element,
         ].join
       end
 
       def double_emphasis(text)
         [
           pre_element,
-          color('emphasis bold'),
-          MDLess.theme['emphasis']['bold_character'],
+          color("emphasis bold"),
+          MDLess.theme["emphasis"]["bold_character"],
           text,
-          MDLess.theme['emphasis']['bold_character'],
+          MDLess.theme["emphasis"]["bold_character"],
           xc,
-          post_element
+          post_element,
         ].join
       end
 
       def emphasis(text)
         [
           pre_element,
-          color('emphasis italic'),
-          MDLess.theme['emphasis']['italic_character'],
+          color("emphasis italic"),
+          MDLess.theme["emphasis"]["italic_character"],
           text,
-          MDLess.theme['emphasis']['italic_character'],
+          MDLess.theme["emphasis"]["italic_character"],
           xc,
-          post_element
+          post_element,
         ].join
       end
 
       def triple_emphasis(text)
         [
           pre_element,
-          color('emphasis bold-italic'),
-          MDLess.theme['emphasis']['italic_character'],
-          MDLess.theme['emphasis']['bold_character'],
+          color("emphasis bold-italic"),
+          MDLess.theme["emphasis"]["italic_character"],
+          MDLess.theme["emphasis"]["bold_character"],
           text,
-          MDLess.theme['emphasis']['bold_character'],
-          MDLess.theme['emphasis']['italic_character'],
+          MDLess.theme["emphasis"]["bold_character"],
+          MDLess.theme["emphasis"]["italic_character"],
           xc,
-          post_element
+          post_element,
         ].join
       end
 
       def highlight(text)
-        "#{pre_element}#{color('highlight')}#{text}#{xc}#{post_element}"
+        "#{pre_element}#{color("highlight")}#{text}#{xc}#{post_element}"
       end
 
       def image(link, title, alt_text)
@@ -407,35 +406,35 @@ module Redcarpet
       def color_link(link, title, content)
         [
           pre_element,
-          color('link brackets'),
-          '[',
-          color('link text'),
+          color("link brackets"),
+          "[",
+          color("link text"),
           content,
-          color('link brackets'),
-          '](',
-          color('link url'),
+          color("link brackets"),
+          "](",
+          color("link url"),
           link,
-          title.nil? ? '' : %( "#{title}"),
-          color('link brackets'),
-          ')',
+          title.nil? ? "" : %( "#{title}"),
+          color("link brackets"),
+          ")",
           xc,
-          post_element
+          post_element,
         ].join
       end
 
       def color_image_tag(link, title, alt_text)
         image = [
-          color('image brackets'),
-          '[',
-          color('image title'),
+          color("image brackets"),
+          "[",
+          color("image title"),
           alt_text,
-          color('image brackets'),
-          '](',
-          color('image url'),
+          color("image brackets"),
+          "](",
+          color("image url"),
           link,
-          title.nil? ? '' : %( "#{title}"),
-          color('image brackets'),
-          ')'
+          title.nil? ? "" : %( "#{title}"),
+          color("image brackets"),
+          ")",
         ].join
 
         @@links << {
@@ -443,67 +442,67 @@ module Redcarpet
           url: link,
           title: title,
           content: alt_text,
-          image: true
+          image: true,
         }
 
         [
-          color('image bang'),
-          '!',
+          color("image bang"),
+          "!",
           image,
-          xc
+          xc,
         ].join
       end
 
       def color_link_reference(link, idx, content)
         [
           pre_element,
-          color('link brackets'),
-          '[',
-          color('link text'),
+          color("link brackets"),
+          "[",
+          color("link text"),
           content,
-          color('link brackets'),
-          '][',
-          color('link url'),
+          color("link brackets"),
+          "][",
+          color("link url"),
           idx,
-          color('link brackets'),
-          ']',
+          color("link brackets"),
+          "]",
           xc,
-          post_element
+          post_element,
         ].join
       end
 
       def color_reference_link(link, title, content, image: false)
         [
-          color('link brackets'),
-          '[',
-          color('link text'),
+          color("link brackets"),
+          "[",
+          color("link text"),
           content,
-          color('link brackets'),
-          ']:',
-          color('text'),
-          ' ',
-          image ? color('image url') : color('link url'),
+          color("link brackets"),
+          "]:",
+          color("text"),
+          " ",
+          image ? color("image url") : color("link url"),
           link,
-          title.nil? ? '' : %( "#{title}"),
-          xc
+          title.nil? ? "" : %( "#{title}"),
+          xc,
         ].join
       end
 
       def color_image_reference(idx, content)
         [
           pre_element,
-          color('image brackets'),
-          '[',
-          color('image title'),
+          color("image brackets"),
+          "[",
+          color("image title"),
           content,
-          color('image brackets'),
-          '][',
-          color('link url'),
+          color("image brackets"),
+          "][",
+          color("link url"),
           idx,
-          color('image brackets'),
-          ']',
+          color("image brackets"),
+          "]",
           xc,
-          post_element
+          post_element,
         ].join
       end
 
@@ -513,25 +512,25 @@ module Redcarpet
           link: res,
           url: link,
           title: title,
-          content: content
+          content: content,
         }
         res
       end
 
       def color_tags(html)
-        html.gsub(%r{((?!<)</?\w+( [^>]+)?>)}, "#{color('html brackets')}\\1#{xc}")
+        html.gsub(%r{((?!<)</?\w+( [^>]+)?>)}, "#{color("html brackets")}\\1#{xc}")
       end
 
       def raw_html(raw_html)
-        "#{pre_element}#{color('html color')}#{color_tags(raw_html)}#{xc}#{post_element}"
+        "#{pre_element}#{color("html color")}#{color_tags(raw_html)}#{xc}#{post_element}"
       end
 
       def strikethrough(text)
-        "#{pre_element}#{color('strikethrough')}#{text}#{xc}#{post_element}"
+        "#{pre_element}#{color("strikethrough")}#{text}#{xc}#{post_element}"
       end
 
       def superscript(text)
-        "#{pre_element}#{color('super')}^#{text}#{xc}#{post_element}"
+        "#{pre_element}#{color("super")}^#{text}#{xc}#{post_element}"
       end
 
       def footnotes(text)
@@ -547,20 +546,20 @@ module Redcarpet
       def color_footnote_def(idx)
         text = @@footnotes[idx]
         [
-          color('footnote brackets'),
+          color("footnote brackets"),
           "[",
-          color('footnote caret'),
+          color("footnote caret"),
           "^",
-          color('footnote title'),
+          color("footnote title"),
           idx,
-          color('footnote brackets'),
+          color("footnote brackets"),
           "]:",
-          color('footnote note'),
-          ' ',
+          color("footnote note"),
+          " ",
           text.uncolor.strip,
           xc,
-          "\n"
-        ].join('')
+          "\n",
+        ].join("")
       end
 
       def footnote_def(text, idx)
@@ -570,18 +569,18 @@ module Redcarpet
       def footnote_ref(text)
         [
           pre_element,
-          color('footnote title'),
+          color("footnote title"),
           "[^#{text}]",
           xc,
-          post_element
-        ].join('')
+          post_element,
+        ].join("")
       end
 
       def insert_footnotes(input)
         input.split(/\n/).map do |line|
           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")
+            footnotes = notes.map { |n| color_footnote_def(n["ref"].to_i) }.join("\n")
             "#{line}\n\n#{footnotes}\n\n\n"
           else
             line
@@ -609,7 +608,7 @@ module Redcarpet
 
         lines = input.split(/\n/)
         line1 = lines.shift
-        pre = ' '
+        pre = " "
 
         body = lines.map { |l| "#{pre}#{l.rstrip}" }.join("\n")
         "#{line1}\n#{body}"
@@ -617,26 +616,26 @@ module Redcarpet
 
       def color_list_item(indent, content, type, counter)
         out = case type
-              when :unordered
-                [
-                  ' ' * indent,
-                  color('list bullet'),
-                  MDLess.theme['list']['ul_char'].strip,
-                  ' ',
-                  color('list color'),
-                  indent_lines(content).strip,
-                  xc
-                ].join
-              when :ordered
-                [
-                  ' ' * indent,
-                  color('list number'),
-                  "#{counter}. ",
-                  color('list color'),
-                  indent_lines(content).strip,
-                  xc
-                ].join
-              end
+          when :unordered
+            [
+              " " * indent,
+              color("list bullet"),
+              MDLess.theme["list"]["ul_char"].strip,
+              " ",
+              color("list color"),
+              indent_lines(content).strip,
+              xc,
+            ].join
+          when :ordered
+            [
+              " " * indent,
+              color("list number"),
+              "#{counter}. ",
+              color("list color"),
+              indent_lines(content).strip,
+              xc,
+            ].join
+          end
         if MDLess.options[:at_tags] || MDLess.options[:taskpaper]
           color_tags(out)
         else
@@ -657,7 +656,7 @@ module Redcarpet
       def nest_lists(input, indent = 0)
         input.gsub!(%r{<<list(?<id>\d+)-(?<type>.*?)>>(?<content>.*?)<</list\k<id>>>}m) do
           m = Regexp.last_match
-          lines = m['content'].strip.split(/\n/)
+          lines = m["content"].strip.split(/\n/)
 
           list = nest_lists(lines.map do |l|
             outdent = l.scan(%r{<</list\d+>>}).count
@@ -667,18 +666,18 @@ module Redcarpet
           end.join("\n"), indent)
           next if list.nil?
 
-          "<<main#{m['id']}>>#{list}<</main#{m['id']}>>\n\n"
+          "<<main#{m["id"]}>>#{list}<</main#{m["id"]}>>\n\n"
         end
 
         input.gsub(/^(?<indent> +)<<main(?<id>\d+)>>(?<content>.*?)<<\/main\k<id>>>/m) do
           m = Regexp.last_match
-          "#{m['indent']}#{m['content']}"
+          "#{m["indent"]}#{m["content"]}"
         end
       end
 
       def normalize_indentation(line)
         line.gsub(/^([ \t]+)/) do |pre|
-          pre.gsub(/\t/, ' ')
+          pre.gsub(/\t/, " ")
         end
       end
 
@@ -686,8 +685,8 @@ module Redcarpet
         content.gsub(%r{^(?<indent> *)<<listitem(?<id>\d+)-(?<type>(?:un)?ordered)>>(?<content>.*?)<</listitem\k<id>>>}m) do
           m = Regexp.last_match
 
-          indent = m['indent'].length
-          if m['type'].to_sym == :ordered
+          indent = m["indent"].length
+          if m["type"].to_sym == :ordered
             if indent == last_indent
               levels[indent] ||= 0
               levels[indent] += 1
@@ -701,15 +700,15 @@ module Redcarpet
             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])
+          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])
         end
       end
 
       def fix_list_items(input)
         input.gsub(%r{<<main(?<id>\d+)>>(?<content>.*?)<</main\k<id>>>}m) do
           m = Regexp.last_match
-          fix_items(m['content'])
+          fix_items(m["content"])
         end
       end
 
@@ -732,9 +731,9 @@ module Redcarpet
               title = h[2]
             end
             @headers << [
-              '#' * hlevel,
+              "#" * hlevel,
               title,
-              h[0]
+              h[0],
             ]
           end
         end
@@ -748,16 +747,16 @@ module Redcarpet
         MDLess.meta = {}
         first_line = input.split("\n").first
         if first_line =~ /(?i-m)^---[ \t]*?$/
-          MDLess.log.info('Found YAML')
+          MDLess.log.info("Found YAML")
           # YAML
           in_yaml = true
           input.sub!(/(?i-m)^---[ \t]*\n(?<content>(?:[\s\S]*?))\n[-.]{3}[ \t]*\n/m) do
             m = Regexp.last_match
-            MDLess.log.info('Processing YAML header')
+            MDLess.log.info("Processing YAML header")
             begin
-              MDLess.meta = YAML.load(m['content']).each_with_object({}) { |(k, v), h| h[k.downcase] = v }
+              MDLess.meta = YAML.load(m["content"]).each_with_object({}) { |(k, v), h| h[k.downcase] = v }
             rescue Psych::DisallowedClass => e
-              @log.error('Error reading YAML header')
+              @log.error("Error reading YAML header")
               @log.error(e)
               MDLess.meta = {}
             rescue StandardError => e
@@ -769,10 +768,10 @@ module Redcarpet
             longest = longest < MDLess.cols ? longest + 1 : MDLess.cols
             lines.map do |line|
               if line =~ /^[-.]{3}\s*$/
-                line = "#{color('metadata marker')}#{'%' * longest}"
+                line = "#{color("metadata marker")}#{"%" * longest}"
               else
                 line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-                line = "#{color('metadata marker')}% #{color('metadata color')}#{line}"
+                line = "#{color("metadata marker")}% #{color("metadata color")}#{line}"
               end
               line += "\u00A0" * (longest - line.uncolor.strip.length) if (longest - line.uncolor.strip.length).positive?
               line + xc
@@ -781,7 +780,7 @@ module Redcarpet
         end
 
         if !in_yaml && first_line =~ /(?i-m)^[\w ]+:\s+\S+/
-          MDLess.log.info('Found MMD Headers')
+          MDLess.log.info("Found MMD Headers")
           input.sub!(/(?i-m)^([\S ]+:[\s\S]*?)+(?=\n *\n)/) do |mmd|
             lines = mmd.split(/\n/)
             return mmd if lines.count > 20
@@ -793,11 +792,11 @@ module Redcarpet
               line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
               parts = line.match(/^[ \t]*(\S.*?):[ \t]+(\S.*?)$/)
               if parts
-                key = parts[1].gsub(/[^a-z0-9\-_]/i, '')
+                key = parts[1].gsub(/[^a-z0-9\-_]/i, "")
                 value = parts[2].strip
                 MDLess.meta[key] = value
               end
-              line = "#{color('metadata marker')}%#{color('metadata color')}#{line}"
+              line = "#{color("metadata marker")}%#{color("metadata color")}#{line}"
               line += "\u00A0" * (longest - line.uncolor.strip.length) if (longest - line.uncolor.strip.length).positive?
               line + xc
             end.join("\n") + "#{xc}\n"
@@ -808,15 +807,15 @@ module Redcarpet
       end
 
       def mmd_transclude(input)
-        return input unless MDLess.file || MDLess.meta.key?('transcludebase')
+        return input unless MDLess.file || MDLess.meta.key?("transcludebase")
 
         input.gsub(/^{{(.*?)}}/) do |m|
           filename = Regexp.last_match(1).strip
-          file = if MDLess.meta.key?('transcludebase')
-            File.join(File.expand_path(MDLess.meta['transcludebase']), filename)
-          else
-            File.join(File.dirname(MDLess.file), filename)
-          end
+          file = if MDLess.meta.key?("transcludebase")
+              File.join(File.expand_path(MDLess.meta["transcludebase"]), filename)
+            else
+              File.join(File.dirname(MDLess.file), filename)
+            end
           File.exist?(file) ? "\n\n#{mmd_transclude(IO.read(file).remove_meta)}\n\n" : m
         end
       end
@@ -851,7 +850,7 @@ module Redcarpet
 
         if MDLess.options[:section]
           new_content = []
-          MDLess.log.info("Matching section(s) #{MDLess.options[:section].join(', ')}")
+          MDLess.log.info("Matching section(s) #{MDLess.options[:section].join(", ")}")
           MDLess.options[:section].each do |sect|
             comparison = MDLess.options[:section][0].is_a?(String) ? :regex : :numeric
 
@@ -888,7 +887,7 @@ module Redcarpet
         # definition lists
         input.gsub!(/(?mi)(?<=\n|\A)(?<term>(?!<:)[^\n]+)(?<def>(\n+: [^\n]+)+)/) do
           m = Regexp.last_match
-          "#{color('dd term')}#{m['term']}#{xc}#{color('dd color')}#{color_dd_def(m['def'])}"
+          "#{color("dd term")}#{m["term"]}#{xc}#{color("dd color")}#{color_dd_def(m["def"])}"
         end
 
         input
@@ -898,11 +897,11 @@ module Redcarpet
         input.gsub(/(?<=\n|\A)(?::)\s+(.*)/) do
           m = Regexp.last_match
           [
-            color('dd marker'),
+            color("dd marker"),
             ": ",
-            color('dd color'),
+            color("dd color"),
             m[1],
-            xc
+            xc,
           ].join
         end
       end
@@ -910,7 +909,7 @@ module Redcarpet
       def color_links(input)
         input.gsub(/(?mi)(?<!\\e)\[(?<text>[^\[]+)\]\((?<url>\S+)(?: +"(?<title>.*?)")? *\)/) do
           m = Regexp.last_match
-          color_link(m['url'].uncolor, m['title']&.uncolor, m['text'].uncolor)
+          color_link(m["url"].uncolor, m["title"]&.uncolor, m["text"].uncolor)
         end
       end
 
@@ -924,13 +923,26 @@ module Redcarpet
           links_added = false
 
           @@links.each do |link|
-            if graf =~ /#{Regexp.escape(link[:link].gsub(/\n/, ' '))}/
+            if graf =~ /#{Regexp.escape(link[:link].gsub(/\n/, " "))}/
+              table = graf.uncolor =~ /^ *\|/
               url = link[:url].uncolor
               content = link[:content]
               title = link[:title]&.uncolor
               image = link.key?(:image) && link[:image] ? true : false
               colored_link = image ? color_image_reference(counter, content) : color_link_reference(url, counter, content)
-              graf.gsub!(/#{Regexp.escape(link[:link].gsub(/\n/, ' '))}/, colored_link)
+              if table
+                diff = link[:link].gsub(/\n/, " ").uncolor.length - colored_link.uncolor.gsub(/\n/, " ").length
+                graf.gsub!(/(?<=\|)([^\|]*?)#{Regexp.escape(link[:link].gsub(/\n/, " "))}(.*?)(?=\|)/) do
+                  before = Regexp.last_match(1)
+                  after = Regexp.last_match(2)
+                  surround = "#{before}#{after}"
+                  puts "**#{surround}**"
+                  diff += 2 if surround.uncolor.gsub(/#{CLIMarkdown::MDTableCleanup::PAD_CHAR}*/, "").strip.length.zero?
+                  "#{before}#{colored_link}#{after}#{" " * diff}"
+                end
+              else
+                graf.gsub!(/#{Regexp.escape(link[:link].gsub(/\n/, " "))}/, colored_link)
+              end
               if MDLess.options[:links] == :paragraph
                 if links_added
                   graf += "\n#{color_reference_link(url, title, counter, image: image)}"
@@ -957,56 +969,56 @@ module Redcarpet
       def fix_colors(input)
         input.gsub(/<<pre(?<id>\d+)>>(?<content>.*?)<<post\k<id>>>/m) do
           m = Regexp.last_match
-          pre = m.pre_match.gsub(/<<pre(?<id>\d+)>>.*?<<post\k<id>>>/m, '')
+          pre = m.pre_match.gsub(/<<pre(?<id>\d+)>>.*?<<post\k<id>>>/m, "")
           last_color = pre.last_color_code
 
-          "#{fix_colors(m['content'])}#{last_color}"
-        end.gsub(/<<(pre|post)\d+>>/, '')
+          "#{fix_colors(m["content"])}#{last_color}"
+        end.gsub(/<<(pre|post)\d+>>/, "")
       end
 
       def render_images(input)
         input.gsub(%r{<<img>>(.*?)<</img>>}) do
           link, title, alt_text = Regexp.last_match(1).split(/\|\|/)
 
-          if (exec_available('imgcat') || exec_available('chafa')) && MDLess.options[:local_images]
-            if exec_available('imgcat')
-              MDLess.log.info('Using imgcat for image rendering')
-            elsif exec_available('chafa')
-              MDLess.log.info('Using chafa for image rendering')
+          if (exec_available("imgcat") || exec_available("chafa")) && MDLess.options[:local_images]
+            if exec_available("imgcat")
+              MDLess.log.info("Using imgcat for image rendering")
+            elsif exec_available("chafa")
+              MDLess.log.info("Using chafa for image rendering")
             end
             img_path = link
             if img_path =~ /^http/ && MDLess.options[:remote_images]
-              if exec_available('imgcat')
-                MDLess.log.info('Using imgcat for image rendering')
+              if exec_available("imgcat")
+                MDLess.log.info("Using imgcat for image rendering")
                 begin
                   res, s = Open3.capture2(%(curl -sS "#{img_path}" 2> /dev/null | imgcat))
 
                   if s.success?
-                    pre = !alt_text.nil? ? "    #{c(%i[d blue])}[#{alt_text.strip}]\n" : ''
-                    post = !title.nil? ? "\n    #{c(%i[b blue])}-- #{title} --" : ''
+                    pre = !alt_text.nil? ? "    #{c(%i[d blue])}[#{alt_text.strip}]\n" : ""
+                    post = !title.nil? ? "\n    #{c(%i[b blue])}-- #{title} --" : ""
                     result = pre + res + post
                   end
                 rescue StandardError => e
                   MDLess.log.error(e)
                 end
-              elsif exec_available('chafa')
-                MDLess.log.info('Using chafa for image rendering')
-                term = '-f sixels'
-                term = ENV['TERMINAL_PROGRAM'] =~ /iterm/i ? '-f iterm' : term
-                term = ENV['TERMINAL_PROGRAM'] =~ /kitty/i ? '-f kitty' : term
-                FileUtils.rm_r '.mdless_tmp', force: true if File.directory?('.mdless_tmp')
-                Dir.mkdir('.mdless_tmp')
-                Dir.chdir('.mdless_tmp')
+              elsif exec_available("chafa")
+                MDLess.log.info("Using chafa for image rendering")
+                term = "-f sixels"
+                term = ENV["TERMINAL_PROGRAM"] =~ /iterm/i ? "-f iterm" : term
+                term = ENV["TERMINAL_PROGRAM"] =~ /kitty/i ? "-f kitty" : term
+                FileUtils.rm_r ".mdless_tmp", force: true if File.directory?(".mdless_tmp")
+                Dir.mkdir(".mdless_tmp")
+                Dir.chdir(".mdless_tmp")
                 `curl -SsO #{img_path} 2> /dev/null`
                 tmp_img = File.basename(img_path)
                 img = `chafa #{term} "#{tmp_img}"`
-                pre = alt_text ? "    #{c(%i[d blue])}[#{alt_text.strip}]\n" : ''
-                post = title ? "\n    #{c(%i[b blue])}-- #{title} --" : ''
+                pre = alt_text ? "    #{c(%i[d blue])}[#{alt_text.strip}]\n" : ""
+                post = title ? "\n    #{c(%i[b blue])}-- #{title} --" : ""
                 result = pre + img + post
-                Dir.chdir('..')
-                FileUtils.rm_r '.mdless_tmp', force: true
+                Dir.chdir("..")
+                FileUtils.rm_r ".mdless_tmp", force: true
               else
-                MDLess.log.warn('No viewer for remote images')
+                MDLess.log.warn("No viewer for remote images")
               end
             else
               if img_path =~ %r{^[~/]}
@@ -1016,14 +1028,14 @@ module Redcarpet
                 img_path = File.join(base, img_path)
               end
               if File.exist?(img_path)
-                pre = !alt_text.nil? ? "    #{c(%i[d blue])}[#{alt_text.strip}]\n" : ''
-                post = !title.nil? ? "\n    #{c(%i[b blue])}-- #{title} --" : ''
-                if exec_available('imgcat')
+                pre = !alt_text.nil? ? "    #{c(%i[d blue])}[#{alt_text.strip}]\n" : ""
+                post = !title.nil? ? "\n    #{c(%i[b blue])}-- #{title} --" : ""
+                if exec_available("imgcat")
                   img = `imgcat "#{img_path}"`
-                elsif exec_available('chafa')
-                  term = '-f sixels'
-                  term = ENV['TERMINAL_PROGRAM'] =~ /iterm/i ? '-f iterm' : term
-                  term = ENV['TERMINAL_PROGRAM'] =~ /kitty/i ? '-f kitty' : term
+                elsif exec_available("chafa")
+                  term = "-f sixels"
+                  term = ENV["TERMINAL_PROGRAM"] =~ /iterm/i ? "-f iterm" : term
+                  term = ENV["TERMINAL_PROGRAM"] =~ /kitty/i ? "-f kitty" : term
                   img = `chafa #{term} "#{img_path}"`
                 end
                 result = pre + img + post
@@ -1050,36 +1062,36 @@ module Redcarpet
           end
           [
             pre_element,
-            color('math brackets'),
+            color("math brackets"),
             brackets[0],
             xc,
-            color('math equation'),
+            color("math equation"),
             equat,
-            color('math brackets'),
+            color("math brackets"),
             brackets[1],
             xc,
-            post_element
+            post_element,
           ].join
         end
       end
 
       def highlight_tags(input)
-        tag_color = color('at_tags tag')
-        value_color = color('at_tags value')
+        tag_color = color("at_tags tag")
+        value_color = color("at_tags value")
         input.gsub(/(?<pre>\s|m)(?<tag>@[^ \]:;.?!,("'\n]+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
           m = Regexp.last_match
           last_color = m.pre_match.last_color_code
           [
-            m['pre'],
+            m["pre"],
             tag_color,
-            m['tag'],
-            m['lparen'],
+            m["tag"],
+            m["lparen"],
             value_color,
-            m['value'],
+            m["value"],
             tag_color,
-            m['rparen'],
+            m["rparen"],
             xc,
-            last_color
+            last_color,
           ].join
         end
       end
@@ -1089,14 +1101,14 @@ module Redcarpet
           content = Regexp.last_match(1)
           [
             pre_element,
-            color('link brackets'),
-            '[[',
-            color('link text'),
+            color("link brackets"),
+            "[[",
+            color("link text"),
             content,
-            color('link brackets'),
-            ']]',
+            color("link brackets"),
+            "]]",
             xc,
-            post_element
+            post_element,
           ].join
         end
       end