mdless 2.0.18 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8cad0405ab64bec59625210dfbf2708d23609ccc5f682b1a7c26d435ffb3d49
-  data.tar.gz: 747d4a04599b35b21a1a83c2607145cac4c0c5748acf6d0bde8ec024bcb7fd69
+  metadata.gz: a4af619d93405da0eb2861158c261c7cd2c494530f32c3e5de2a8be9b4c7d713
+  data.tar.gz: 17c466f16b258b5959be6ac0f2540594a36b3319007692897200999749c34cc1
 SHA512:
-  metadata.gz: aacd16705ef1fa770536f10b3642fa536a6db9418248c760e9c47dce8ffbfca9fb55401d7f0507ae82bf6805080f530777d640eebb41dc513772c2c98b5c1e66
-  data.tar.gz: 69243a2f1968d871b222740ea9f3a8dd8f76895be6c49e8fb59db20f2ef85c78046b880eab0e95f4a6e1a6b377954904b15670d4f7ed1397cfa821da7a70f857
+  metadata.gz: 36f0963f1629e9cf7f65576c6340dc1bd1fd2ee8e2f47ccf9cde5852581db3a502804e571b28b3501f1a3dc9b29ea0c214eb504b9771c89bed27fd6ce9147377
+  data.tar.gz: d39dcf70ca3b26573f9459489b4ca3aafaa9f3d014d83d63aa76e0d4dbe37138a8c25b421b9b00457d9c6ab105b8fdbd3cf6fb85f6549d4963ae72694bc6e4ab

data/lib/mdless/colors.rb

@@ -133,7 +133,6 @@ module CLIMarkdown
     end
 
     def wrap(width=78,foreground=:x)
-
       if self.uncolor =~ /(^([%~] |\s*>)| +[=\-]{5,})/
         return self
       end
@@ -145,6 +144,9 @@ module CLIMarkdown
 
       line += self.match(/^\s*/)[0].gsub(/\t/,'    ')
       input = self.dup # .gsub(/(\w-)(\w)/,'\1 \2')
+      input.gsub!(/\[.*?\]\(.*?\)/) do |link|
+        link.gsub(/ /, "\u00A0")
+      end
       input.split(/\s+/).each do |word|
         last_ansi = line.scan(/\e\[[\d;]+m/)[-1] || ''
         if visible_width + word.size_clean >= width
@@ -158,9 +160,11 @@ module CLIMarkdown
           visible_width += word.size_clean + 1
           line << " " << last_ansi + word
         end
-       end
-       lines << line + self.match(/\s*$/)[0] + xc(foreground) if line
-      return lines.join("\n") # .gsub(/\- (\S)/,'-\1')
+      end
+      lines << line + match(/\s*$/)[0] + xc(foreground) if line
+      lines.join("\n").gsub(/\[.*?\]\(.*?\)/) do |link|
+        link.gsub(/\u00A0/, ' ')
+      end
     end
 
     def c(args)

data/lib/mdless/console.rb

@@ -4,13 +4,13 @@ module Redcarpet
       include CLIMarkdown::Colors
       include CLIMarkdown::Theme
 
-      attr_writer :theme, :cols, :log, :options, :file
+      attr_accessor :headers
+      attr_writer :file
 
       @@listitemid = 0
       @@listid = 0
       @@elementid = 0
       @@footnotes = []
-      @@headers = []
       @@links = []
       @@footer_links = []
 
@@ -66,22 +66,22 @@ module Redcarpet
       end
 
       def hilite_code(code_block, language)
-        if @options[:syntax_higlight] && !exec_available('pygmentize')
-          @log.error('Syntax highlighting requested by pygmentize is not available')
-          @options[:syntax_higlight] = false
+        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
 
         longest_line = code_block.uncolor.split(/\n/).longest_element.length + 4
-        longest_line = longest_line > @cols ? @cols : longest_line
+        longest_line = longest_line > MDLess.cols ? MDLess.cols : longest_line
 
-        if @options[:syntax_higlight]
+        if MDLess.options[:syntax_higlight]
           pyg = TTY::Which.which('pygmentize')
           lexer = language&.valid_lexer? ? "-l #{language}" : '-g'
           begin
-            pygments_theme = @options[:pygments_theme] || @theme['code_block']['pygments_theme']
+            pygments_theme = MDLess.options[:pygments_theme] || MDLess.theme['code_block']['pygments_theme']
 
             unless pygments_theme.valid_pygments_theme?
-              @log.error("Invalid Pygments theme #{pygments_theme}, defaulting to 'default' for highlighting")
+              MDLess.log.error("Invalid Pygments theme #{pygments_theme}, defaulting to 'default' for highlighting")
               pygments_theme = 'default'
             end
 
@@ -100,10 +100,10 @@ module Redcarpet
                   '> ',
                   "#{color('code_block bg')}#{l.strip}#{xc}"
                 ].join
-              end.join("\n").blackout(@theme['code_block']['bg']) + "#{xc}\n"
+              end.join("\n").blackout(MDLess.theme['code_block']['bg']) + "#{xc}\n"
             end
           rescue StandardError => e
-            @log.error(e)
+            MDLess.log.error(e)
             hilite = code_block
           end
         else
@@ -115,7 +115,7 @@ module Redcarpet
               line,
               xc
             ].join
-          end.join("\n").blackout(@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?
@@ -142,17 +142,17 @@ module Redcarpet
       def color(key)
         val = nil
         keys = key.split(/[ ,>]/)
-        if @theme.key?(keys[0])
-          val = @theme[keys.shift]
+        if MDLess.theme.key?(keys[0])
+          val = MDLess.theme[keys.shift]
         else
-          @log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
+          MDLess.log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
           return c([:reset])
         end
         keys.each do |k|
           if val.key?(k)
             val = val[k]
           else
-            @log.error("Invalid theme key: #{k}")
+            MDLess.log.error("Invalid theme key: #{k}")
             return c([:reset])
           end
         end
@@ -171,11 +171,12 @@ module Redcarpet
 
       def block_quote(quote)
         ret = "\n\n"
-        quote.split("\n").each do |line|
+        quote.wrap(MDLess.cols, color('blockquote color')).split(/\n/).each do |line|
           ret += [
             color('blockquote marker color'),
-            @theme['blockquote']['marker']['character'],
+            MDLess.theme['blockquote']['marker']['character'],
             color('blockquote color'),
+            ' ',
             line,
             "\n"
           ].join('')
@@ -190,17 +191,18 @@ module Redcarpet
       def header(text, header_level)
         pad = ''
         ansi = ''
+        text.clean_header_ids!
         case header_level
         when 1
           ansi = color('h1 color')
           pad = color('h1 pad')
-          char = @theme['h1']['pad_char'] || '='
-          pad += text.length + 2 > @cols ? char * text.length : char * (@cols - (text.length + 1))
+          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 = @theme['h2']['pad_char'] || '-'
-          pad += text.length + 2 > @cols ? char * text.length : char * (@cols - (text.length + 1))
+          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')
         when 4
@@ -215,15 +217,15 @@ module Redcarpet
         # iTerm Marks for navigation on h1-3
         if header_level < 4 &&
            ENV['TERM_PROGRAM'] =~ /^iterm/i &&
-           @options[:pager] == false
+           MDLess.options[:pager] == false
           ansi = "\e]1337;SetMark\a#{ansi}"
         end
 
-        "\n#{xc}#{ansi}#{text} #{pad}#{xc}\n\n"
+        "\n\n#{xc}#{ansi}#{text} #{pad}#{xc}\n\n"
       end
 
       def hrule()
-        "\n\n#{color('hr color')}#{'_' * @cols}#{xc}\n\n"
+        "\n\n#{color('hr color')}#{'_' * MDLess.cols}#{xc}\n\n"
       end
 
       def paragraph(text)
@@ -248,6 +250,7 @@ module Redcarpet
       end
 
       def table(header, body)
+        @header_row = []
         formatted = CLIMarkdown::MDTableCleanup.new([
           "#{header}",
           table_header_row,
@@ -255,7 +258,7 @@ module Redcarpet
           "#{body}\n\n"
         ].join(''))
         res = formatted.to_md
-        "#{color_table(res)}\n"
+        "#{color_table(res)}\n\n"
         # res
       end
 
@@ -290,11 +293,11 @@ module Redcarpet
         [
           pre_element,
           color('code_span marker'),
-          @theme['code_span']['character'],
+          MDLess.theme['code_span']['character'],
           color('code_span color'),
           code,
           color('code_span marker'),
-          @theme['code_span']['character'],
+          MDLess.theme['code_span']['character'],
           xc,
           post_element
         ].join('')
@@ -304,9 +307,9 @@ module Redcarpet
         [
           pre_element,
           color('emphasis bold'),
-          @theme['emphasis']['bold_character'],
+          MDLess.theme['emphasis']['bold_character'],
           text,
-          @theme['emphasis']['bold_character'],
+          MDLess.theme['emphasis']['bold_character'],
           xc,
           post_element
         ].join
@@ -316,9 +319,9 @@ module Redcarpet
         [
           pre_element,
           color('emphasis italic'),
-          @theme['emphasis']['italic_character'],
+          MDLess.theme['emphasis']['italic_character'],
           text,
-          @theme['emphasis']['italic_character'],
+          MDLess.theme['emphasis']['italic_character'],
           xc,
           post_element
         ].join
@@ -328,11 +331,11 @@ module Redcarpet
         [
           pre_element,
           color('emphasis bold-italic'),
-          @theme['emphasis']['italic_character'],
-          @theme['emphasis']['bold_character'],
+          MDLess.theme['emphasis']['italic_character'],
+          MDLess.theme['emphasis']['bold_character'],
           text,
-          @theme['emphasis']['bold_character'],
-          @theme['emphasis']['italic_character'],
+          MDLess.theme['emphasis']['bold_character'],
+          MDLess.theme['emphasis']['italic_character'],
           xc,
           post_element
         ].join
@@ -528,7 +531,7 @@ module Redcarpet
         lines = input.split(/\n/)
         line1 = lines.shift
         pre = '  ' * (indent + 1)
-        cols = @cols - pre.length
+        cols = MDLess.cols - pre.length
         body = lines.map { |l| "#{pre}#{l}" }.join("\n")
         "#{line1}\n#{body}"
       end
@@ -622,8 +625,8 @@ module Redcarpet
       end
 
       def get_headers(input)
-        unless @@headers && !@@headers.empty?
-          @@headers = []
+        unless @headers && !@headers.empty?
+          @headers = []
           headers = input.scan(/^((?!#!)(\#{1,6})\s*([^#]+?)(?: #+)?\s*|(\S.+)\n([=-]+))$/i)
 
           headers.each do |h|
@@ -639,7 +642,7 @@ module Redcarpet
               hlevel = h[1].length
               title = h[2]
             end
-            @@headers << [
+            @headers << [
               '#' * hlevel,
               title,
               h[0]
@@ -647,7 +650,7 @@ module Redcarpet
           end
         end
 
-        @@headers
+        @headers
       end
 
       def color_meta(text)
@@ -656,15 +659,15 @@ module Redcarpet
 
         first_line = input.split("\n").first
         if first_line =~ /(?i-m)^---[ \t]*?$/
-          @log.info('Found YAML')
+          MDLess.log.info('Found YAML')
           # YAML
           in_yaml = true
           input.sub!(/(?i-m)^---[ \t]*\n([\s\S]*?)\n[-.]{3}[ \t]*\n/m) do
             m = Regexp.last_match
-            @log.info('Processing YAML Header')
+            MDLess.log.info('Processing YAML Header')
             lines = m[0].split(/\n/)
             longest = lines.longest_element.length
-            longest = longest < @cols ? longest + 1 : @cols
+            longest = longest < MDLess.cols ? longest + 1 : MDLess.cols
             lines.map do |line|
               if line =~ /^[-.]{3}\s*$/
                 line = "#{color('metadata marker')}#{'%' * longest}"
@@ -680,13 +683,13 @@ module Redcarpet
         end
 
         if !in_yaml && first_line =~ /(?i-m)^[\w ]+:\s+\S+/
-          @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
 
             longest = lines.inject { |memo, word| memo.length > word.length ? memo : word }.length
-            longest = longest < @cols ? longest + 1 : @cols
+            longest = longest < MDLess.cols ? longest + 1 : MDLess.cols
             lines.map do |line|
               line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
               line = "#{color('metadata color')}#{line}"
@@ -706,14 +709,17 @@ module Redcarpet
         input.gsub!(/^([^\n]+)\n={2,}\s*$/m, "# \\1\n")
         input.gsub!(/^([^\n]+?)\n-{2,}\s*$/m, "## \\1\n")
 
-        @@headers = get_headers(input)
+        @headers = get_headers(input)
 
-        if @options[:section]
+        if MDLess.options[:section]
           new_content = []
-          @options[:section].each do |sect|
+          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
+
             in_section = false
             top_level = 1
-            input.split(/\n/).each do |graf|
+            input.split(/\n/).each_with_index do |graf, idx|
               if graf =~ /^(#+) *(.*?)( *#+)?$/
                 m = Regexp.last_match
                 level = m[1].length
@@ -725,7 +731,8 @@ module Redcarpet
                     in_section = false
                     break
                   end
-                elsif title.downcase == @@headers[sect - 1][1].downcase
+                elsif (comparison == :regex && title.downcase =~ sect.downcase.to_rx) ||
+                      (comparison == :numeric && title.downcase == @headers[sect - 1][1].downcase)
                   in_section = true
                   top_level = level + 1
                   new_content.push(graf)
@@ -774,7 +781,7 @@ module Redcarpet
         counter = 1
 
         grafs.map! do |graf|
-          next if graf =~ /^$/
+          return "\n" if graf =~ /^ *\n$/
 
           links_added = false
 
@@ -784,7 +791,7 @@ module Redcarpet
               content = link[:content]
               title = link[:title]&.uncolor
               graf.gsub!(/#{Regexp.escape(link[:link])}/, color_link_reference(url, counter, content))
-              if @options[:links] == :paragraph
+              if MDLess.options[:links] == :paragraph
                 if links_added
                   graf += "\n#{color_reference_link(url, title, counter)}"
                 else
@@ -800,7 +807,7 @@ module Redcarpet
           "\n#{graf}\n"
         end
 
-        if @options[:links] == :paragraph
+        if MDLess.options[:links] == :paragraph
           grafs.join("\n")
         else
           grafs.join("\n") + "\n#{@@footer_links.join("\n")}\n"
@@ -820,16 +827,16 @@ module Redcarpet
         input.gsub(%r{<<img>>(.*?)<</img>>}) do
           link, title, alt_text = Regexp.last_match(1).split(/\|\|/)
 
-          if (exec_available('imgcat') || exec_available('chafa')) && @options[:local_images]
+          if (exec_available('imgcat') || exec_available('chafa')) && MDLess.options[:local_images]
             if exec_available('imgcat')
-              @log.info('Using imgcat for image rendering')
+              MDLess.log.info('Using imgcat for image rendering')
             elsif exec_available('chafa')
-              @log.info('Using chafa for image rendering')
+              MDLess.log.info('Using chafa for image rendering')
             end
             img_path = link
-            if img_path =~ /^http/ && @options[:remote_images]
+            if img_path =~ /^http/ && MDLess.options[:remote_images]
               if exec_available('imgcat')
-                @log.info('Using imgcat for image rendering')
+                MDLess.log.info('Using imgcat for image rendering')
                 begin
                   res, s = Open3.capture2(%(curl -sS "#{img_path}" 2> /dev/null | imgcat))
 
@@ -839,10 +846,10 @@ module Redcarpet
                     result = pre + res + post
                   end
                 rescue StandardError => e
-                  @log.error(e)
+                  MDLess.log.error(e)
                 end
               elsif exec_available('chafa')
-                @log.info('Using chafa for image rendering')
+                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
@@ -858,13 +865,13 @@ module Redcarpet
                 Dir.chdir('..')
                 FileUtils.rm_r '.mdless_tmp', force: true
               else
-                @log.warn('No viewer for remote images')
+                MDLess.log.warn('No viewer for remote images')
               end
             else
               if img_path =~ %r{^[~/]}
                 img_path = File.expand_path(img_path)
-              elsif @file
-                base = File.expand_path(File.dirname(@file))
+              elsif MDLess.file
+                base = File.expand_path(File.dirname(MDLess.file))
                 img_path = File.join(base, img_path)
               end
               if File.exist?(img_path)
@@ -956,9 +963,9 @@ module Redcarpet
       def postprocess(input)
         input.scrub!
 
-        input = highlight_wiki_links(input) if @options[:wiki_links]
+        input = highlight_wiki_links(input) if MDLess.options[:wiki_links]
 
-        if @options[:inline_footnotes]
+        if MDLess.options[:inline_footnotes]
           input = insert_footnotes(input)
         else
           footnotes = @@footnotes.map.with_index do |fn, i|
@@ -975,11 +982,11 @@ module Redcarpet
         # misc html
         input.gsub!(%r{<br */?>}, "#{pre_element}\n#{post_element}")
         # format links
-        input = reference_links(input) if @options[:links] == :reference || @options[:links] == :paragraph
+        input = reference_links(input) if MDLess.options[:links] == :reference || MDLess.options[:links] == :paragraph
         # lists
         input = fix_lists(input)
-        input = render_images(input) if @options[:local_images]
-        input = highlight_tags(input) if @options[:at_tags] || @options[:taskpaper]
+        input = render_images(input) if MDLess.options[:local_images]
+        input = highlight_tags(input) if MDLess.options[:at_tags] || MDLess.options[:taskpaper]
         fix_colors(input)
       end
     end

data/lib/mdless/converter.rb

@@ -4,39 +4,33 @@ require 'yaml'
 module CLIMarkdown
   class Converter
     include Colors
-    include Theme
-
-    attr_reader :helpers, :log
 
     def version
       "#{CLIMarkdown::EXECUTABLE_NAME} #{CLIMarkdown::VERSION}"
     end
 
     def default(option, default)
-      if @options[option].nil?
-        @options[option] = default
-      end
+      MDLess.options[option] = default if MDLess.options[option].nil?
     end
 
     def initialize(args)
-      @log = Logger.new($stderr)
-      @log.level = Logger::WARN
+      MDLess.log.level = Logger::WARN
 
-      @options = {}
+      MDLess.options = {}
       config = File.expand_path('~/.config/mdless/config.yml')
-      @options = YAML.load(IO.read(config)) if File.exist?(config)
+      MDLess.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"
 
         default(:color, true)
         opts.on('-c', '--[no-]color', 'Colorize output (default on)') do |c|
-          @options[:color] = c
+          MDLess.options[:color] = c
         end
 
         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
+            MDLess.log.level = 5 - level.to_i
           else
             puts 'Error: Debug level out of range (1-4)'
             Process.exit 1
@@ -55,58 +49,64 @@ module CLIMarkdown
           if exec_available('imgcat') || exec_available('chafa')
             case type
             when /^(r|b|a)/i
-              @options[:local_images] = true
-              @options[:remote_images] = true
+              MDLess.options[:local_images] = true
+              MDLess.options[:remote_images] = true
             when /^l/i
-              @options[:local_images] = true
+              MDLess.options[:local_images] = true
             when /^n/
-              @options[:local_images] = false
-              @options[:remote_images] = false
+              MDLess.options[:local_images] = false
+              MDLess.options[:remote_images] = false
             end
           else
-            @log.warn('images turned on but imgcat/chafa not found')
+            MDLess.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
           if exec_available('imgcat') || exec_available('chafa') # && ENV['TERM_PROGRAM'] == 'iTerm.app'
-            @options[:local_images] = true
-            @options[:remote_images] = true
+            MDLess.options[:local_images] = true
+            MDLess.options[:remote_images] = true
           else
-            @log.warn('images turned on but imgcat/chafa not found')
+            MDLess.log.warn('images turned on but imgcat/chafa not found')
           end
         end
 
-
         default(:list, false)
         opts.on('-l', '--list', 'List headers in document and exit') do
-          @options[:list] = true
+          MDLess.options[:list] = true
         end
 
         default(:pager, true)
         opts.on('-p', '--[no-]pager', 'Formatted output to pager (default on)') do |p|
-          @options[:pager] = p
+          MDLess.options[:pager] = p
         end
 
         default(:pager, true)
         opts.on('-P', 'Disable pager (same as --no-pager)') do
-          @options[:pager] = false
+          MDLess.options[:pager] = false
         end
 
         default(: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)
+          sections = section.split(/ *, */).map(&:strip)
+          MDLess.options[:section] = sections.map do |sect|
+            if sect =~ /^\d+$/
+              sect.to_i
+            else
+              sect
+            end
+          end
         end
 
         default(:theme, 'default')
         opts.on('-t', '--theme=THEME_NAME', 'Specify an alternate color theme to load') do |theme|
-          @options[:theme] = theme
+          MDLess.options[:theme] = theme
         end
 
         default(:at_tags, false)
         opts.on('-@', '--at_tags', 'Highlight @tags and values in the document') do
-          @options[:at_tags] = true
+          MDLess.options[:at_tags] = true
         end
 
         opts.on('-v', '--version', 'Display version number') do
@@ -116,37 +116,37 @@ module CLIMarkdown
 
         default(:width, TTY::Screen.cols)
         opts.on('-w', '--width=COLUMNS', 'Column width to format for (default: terminal width)') do |columns|
-          @options[:width] = columns.to_i
+          MDLess.options[:width] = columns.to_i
         end
         cols = TTY::Screen.cols
-        @options[:width] = cols if @options[:width] > cols
+        MDLess.options[:width] = cols if MDLess.options[:width] > cols
 
         default(:autolink, true)
         opts.on('--[no-]autolink', 'Convert bare URLs and emails to <links>') do |p|
-          @options[:autolink] = p
+          MDLess.options[:autolink] = p
         end
 
         default(:inline_footnotes, false)
         opts.on('--[no-]inline_footnotes',
                 'Display footnotes immediately after the paragraph that references them') do |p|
-          @options[:inline_footnotes] = p
+          MDLess.options[:inline_footnotes] = p
         end
 
         default(:intra_emphasis, true)
         opts.on('--[no-]intra-emphasis', 'Parse emphasis inside of words (e.g. Mark_down_)') do |opt|
-          @options[:intra_emphasis] = opt
+          MDLess.options[:intra_emphasis] = opt
         end
 
         default(:lax_spacing, true)
         opts.on('--[no-]lax-spacing', 'Allow lax spacing') do |opt|
-          @options[:lax_spacing] = opt
+          MDLess.options[:lax_spacing] = opt
         end
 
         default(:links, :inline)
         opts.on('--links=FORMAT',
                 'Link style ([inline, reference, paragraph], default inline,
                 "paragraph" will position reference links after each paragraph)') do |fmt|
-          @options[:links] = case fmt
+          MDLess.options[:links] = case fmt
                              when /^:?r/i
                                :reference
                              when /^:?p/i
@@ -158,11 +158,11 @@ module CLIMarkdown
 
         default(:syntax_higlight, false)
         opts.on('--[no-]syntax', 'Syntax highlight code blocks') do |p|
-          @options[:syntax_higlight] = p
+          MDLess.options[:syntax_higlight] = p
         end
 
-        @options[:taskpaper] = if @options[:taskpaper]
-                                 case @options[:taskpaper].to_s
+        MDLess.options[:taskpaper] = if MDLess.options[:taskpaper]
+                                 case MDLess.options[:taskpaper].to_s
                                  when /^[ty1]/
                                    true
                                  when /^a/
@@ -174,7 +174,7 @@ module CLIMarkdown
                                  false
                                end
         opts.on('--taskpaper=OPTION', 'Highlight TaskPaper format (true|false|auto)') do |tp|
-          @options[:taskpaper] = case tp
+          MDLess.options[:taskpaper] = case tp
                                  when /^[ty1]/
                                    true
                                  when /^a/
@@ -186,12 +186,12 @@ module CLIMarkdown
 
         default(:update_config, false)
         opts.on('--update_config', 'Update the configuration file with new keys and current command line options') do
-          @options[:update_config] = true
+          MDLess.options[:update_config] = true
         end
 
         default(:wiki_links, false)
         opts.on('--[no-]wiki-links', 'Highlight [[wiki links]]') do |opt|
-          @options[:wiki_links] = opt
+          MDLess.options[:wiki_links] = opt
         end
       end
 
@@ -202,20 +202,20 @@ module CLIMarkdown
         exit 1
       end
 
-      if !File.exist?(config) || @options[:update_config]
+      if !File.exist?(config) || MDLess.options[:update_config]
         FileUtils.mkdir_p(File.dirname(config))
         File.open(config, 'w') do |f|
-          opts = @options.dup
+          opts = MDLess.options.dup
           opts.delete(:list)
           opts.delete(:section)
           opts.delete(:update_config)
+          opts = opts.keys.map(&:to_s).sort.map { |k| [k.to_sym, opts[k.to_sym]] }.to_h
           f.puts YAML.dump(opts)
           warn "Config file saved to #{config}"
         end
       end
 
-      @theme = load_theme(@options[:theme])
-      @cols = @options[:width] - 2
+      MDLess.cols = MDLess.options[:width] - 2
 
       @output = ''
       @headers = []
@@ -226,19 +226,15 @@ module CLIMarkdown
       @footnotes = {}
 
       renderer = Redcarpet::Render::Console.new
-      renderer.theme = @theme
-      renderer.cols = @cols
-      renderer.log = @log
-      renderer.options = @options
 
       markdown = Redcarpet::Markdown.new(renderer,
-                                         no_intra_emphasis: !@options[:intra_emphasis],
-                                         autolink: @options[:autolink],
+                                         no_intra_emphasis: !MDLess.options[:intra_emphasis],
+                                         autolink: MDLess.options[:autolink],
                                          fenced_code_blocks: true,
                                          footnotes: true,
                                          hard_wrap: false,
                                          highlight: true,
-                                         lax_spacing: @options[:lax_spacing],
+                                         lax_spacing: MDLess.options[:lax_spacing],
                                          quote: false,
                                          space_after_headers: false,
                                          strikethrough: true,
@@ -249,9 +245,9 @@ module CLIMarkdown
       if !args.empty?
         files = args.delete_if { |f| !File.exist?(f) }
         files.each do |file|
-          @log.info(%(Processing "#{file}"))
-          @file = file
-          renderer.file = @file
+          MDLess.log.info(%(Processing "#{file}"))
+          MDLess.file = file
+
           begin
             input = IO.read(file).force_encoding('utf-8')
           rescue StandardError
@@ -262,26 +258,27 @@ module CLIMarkdown
           input.scrub!
           input.gsub!(/\r?\n/, "\n")
 
-          if @options[:list]
-            puts list_headers(input)
+          if MDLess.options[:taskpaper] == :auto
+            MDLess.options[:taskpaper] = if CLIMarkdown::TaskPaper.is_taskpaper?(input)
+                                           MDLess.log.info('TaskPaper detected')
+                                           true
+                                         else
+                                           false
+                                         end
+          end
+
+          if MDLess.options[:list]
+            if MDLess.options[:taskpaper]
+              puts CLIMarkdown::TaskPaper.list_projects(input)
+            else
+              puts list_headers(input)
+            end
             Process.exit 0
           else
-            if @options[:taskpaper] == :auto
-              @options[:taskpaper] = if file =~ /\.taskpaper/
-                                       @log.info('TaskPaper extension detected')
-                                       true
-                                     elsif CLIMarkdown::TaskPaper.is_taskpaper?(input)
-                                       @log.info('TaskPaper document detected')
-                                       true
-                                     else
-                                       false
-                                     end
-            end
-
-            if @options[:taskpaper]
-              input = input.color_meta(@theme, @log, @cols)
-              input = CLIMarkdown::TaskPaper.highlight(input, @theme)
-              @output = input.highlight_tags(@theme, @log)
+            if MDLess.options[:taskpaper]
+              input = input.color_meta(MDLess.cols)
+              input = CLIMarkdown::TaskPaper.highlight(input)
+              @output = input.highlight_tags
             else
               @output = markdown.render(input)
             end
@@ -289,14 +286,34 @@ module CLIMarkdown
         end
         printout
       elsif !$stdin.isatty
-        @file = nil
+        MDLess.file = nil
         input = $stdin.read.scrub
         input.gsub!(/\r?\n/, "\n")
-        if @options[:list]
-          puts list_headers(input)
+
+        if MDLess.options[:taskpaper] == :auto
+          MDLess.options[:taskpaper] = if CLIMarkdown::TaskPaper.is_taskpaper?(input)
+                                         MDLess.log.info('TaskPaper detected')
+                                         true
+                                       else
+                                         false
+                                       end
+        end
+
+        if MDLess.options[:list]
+          if MDLess.options[:taskpaper]
+            puts CLIMarkdown::TaskPaper.list_projects(input)
+          else
+            puts list_headers(input)
+          end
           Process.exit 0
         else
-          @output = markdown.render(input)
+          if MDLess.options[:taskpaper]
+            input = input.color_meta(MDLess.cols)
+            input = CLIMarkdown::TaskPaper.highlight(input)
+            @output = input.highlight_tags
+          else
+            @output = markdown.render(input)
+          end
         end
         printout
       else
@@ -308,17 +325,17 @@ module CLIMarkdown
     def color(key)
       val = nil
       keys = key.split(/[ ,>]/)
-      if @theme.key?(keys[0])
-        val = @theme[keys.shift]
+      if MDLess.theme.key?(keys[0])
+        val = MDLess.theme[keys.shift]
       else
-        @log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
+        MDLess.log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
         return c([:reset])
       end
       keys.each do |k|
         if val.key?(k)
           val = val[k]
         else
-          @log.error("Invalid theme key: #{k}")
+          MDLess.log.error("Invalid theme key: #{k}")
           return c([:reset])
         end
       end
@@ -410,8 +427,8 @@ module CLIMarkdown
 
     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)?( +)/, ' \3\1\2')
+      # input.gsub!(/^(\e\[[\d;]+m)*>(\e\[[\d;]+m)?/, '\1\2')
       input.gsub!(/(\e\[[\d;]+m)?@@@(\e\[[\d;]+m)?$/, '')
       input
     end
@@ -440,7 +457,7 @@ module CLIMarkdown
       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
+        pad_count = [MDLess.cols - orig_length, 0].max
 
         [
           new_code_line,
@@ -464,11 +481,11 @@ module CLIMarkdown
         IO.select [input]
 
         pager = which_pager
-        @log.info("Using #{pager} as pager")
+        MDLess.log.info("Using #{pager} as pager")
         begin
           exec(pager.join(' '))
         rescue SystemCallError => e
-          @log.error(e)
+          MDLess.log.error(e)
           exit 1
         end
       end
@@ -486,21 +503,25 @@ module CLIMarkdown
     end
 
     def printout
-      out = @output.rstrip.split(/\n/).map do |p|
-        p.wrap(@cols, color('text'))
-      end.join("\n")
+      if MDLess.options[:taskpaper]
+        out = @output
+      else
+        out = @output.rstrip.split(/\n/).map do |p|
+          p.wrap(MDLess.cols, color('text'))
+        end.join("\n")
+      end
 
       unless out.size&.positive?
-        @log.warn 'No results'
+        MDLess.log.warn 'No results'
         Process.exit
       end
 
       out = clean_markers(out)
       out = "#{out.gsub(/\n{2,}/m, "\n\n")}#{xc}"
 
-      out.uncolor! unless @options[:color]
+      out.uncolor! unless MDLess.options[:color]
 
-      if @options[:pager]
+      if MDLess.options[:pager]
         page(out)
       else
         $stdout.print out.rstrip
@@ -523,7 +544,7 @@ module CLIMarkdown
           if f.strip =~ /[ |]/
             f
           elsif f == 'most'
-            @log.warn('most not allowed as pager')
+            MDLess.log.warn('most not allowed as pager')
             false
           else
             system "which #{f}", out: File::NULL, err: File::NULL

data/lib/mdless/string.rb

@@ -12,20 +12,20 @@ class ::String
     replace clean_empty_lines
   end
 
-  def color(key, theme, log)
+  def color(key)
     val = nil
     keys = key.split(/[ ,>]/)
-    if theme.key?(keys[0])
-      val = theme[keys.shift]
+    if MDLess.theme.key?(keys[0])
+      val = MDLess.theme[keys.shift]
     else
-      log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
+      MDLess.log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
       return c([:reset])
     end
     keys.each do |k|
       if val.key?(k)
         val = val[k]
       else
-        log.error("Invalid theme key: #{k}")
+        MDLess.log.error("Invalid theme key: #{k}")
         return c([:reset])
       end
     end
@@ -38,9 +38,21 @@ class ::String
     end
   end
 
-  def color_meta(theme, log, cols)
-    @theme = theme
-    @log = log
+  def to_rx(distance: 2, string_start: false)
+    chars = downcase.split(//)
+    pre = string_start ? '^' : '^.*?'
+    /#{pre}#{chars.join(".{,#{distance}}")}.*?$/
+  end
+
+  def clean_header_ids!
+    replace clean_header_ids
+  end
+
+  def clean_header_ids
+    gsub(/ +\[.*?\] *$/, '').gsub(/ *\{#.*?\} *$/, '').strip
+  end
+
+  def color_meta(cols)
     @cols = cols
     input = dup
     input.clean_empty_lines!
@@ -48,21 +60,21 @@ class ::String
     in_yaml = false
     first_line = input.split("\n").first
     if first_line =~ /(?i-m)^---[ \t]*?$/
-      @log.info('Found YAML')
+      MDLess.log.info('Found YAML')
       # YAML
       in_yaml = true
       input.sub!(/(?i-m)^---[ \t]*\n([\s\S]*?)\n[-.]{3}[ \t]*\n/m) do
         m = Regexp.last_match
-        @log.info('Processing YAML Header')
+        MDLess.log.info('Processing YAML Header')
         lines = m[0].split(/\n/)
         longest = lines.inject { |memo, word| memo.length > word.length ? memo : word }.length
         longest = longest < @cols ? longest + 1 : @cols
         lines.map do |line|
           if line =~ /^[-.]{3}\s*$/
-            line = "#{color('metadata marker', @theme, @log)}#{'%' * longest}"
+            line = "#{color('metadata marker')}#{'%' * longest}"
           else
             line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-            line = "#{color('metadata color', @theme, @log)}#{line}"
+            line = "#{color('metadata color')}#{line}"
           end
 
           line += "\u00A0" * (longest - line.uncolor.strip.length) + xc
@@ -72,7 +84,7 @@ class ::String
     end
 
     if !in_yaml && first_line =~ /(?i-m)^[\w ]+:\s+\S+/
-      @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
@@ -81,7 +93,7 @@ class ::String
         longest = longest < @cols ? longest + 1 : @cols
         lines.map do |line|
           line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-          line = "#{color('metadata color', @theme, @log)}#{line}"
+          line = "#{color('metadata color')}#{line}"
           line += "\u00A0" * (longest - line.uncolor.strip.length)
           line + xc
         end.join("\n") + "#{"\u00A0" * longest}#{xc}\n"
@@ -91,9 +103,10 @@ class ::String
     input
   end
 
-  def highlight_tags(theme, log)
-    tag_color = color('at_tags tag', theme, log)
-    value_color = color('at_tags value', theme, log)
+  def highlight_tags
+    log = MDLess.log
+    tag_color = color('at_tags tag')
+    value_color = color('at_tags value')
     gsub(/(?<pre>\s|m)(?<tag>@[^ \].?!,("']+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
       m = Regexp.last_match
       last_color = m.pre_match.last_color_code
@@ -122,20 +135,13 @@ class ::String
 
   def valid_pygments_theme?
     return false unless TTY::Which.exist?('pygmentize')
-    pyg = TTY::Which.which('pygmentize')
-    res = `#{pyg} -L styles`
-    styles = res.scan(/\* ([\w-]+):/).map { |l| l[0] }
-    styles.include?(self)
+
+    MDLess.pygments_styles.include?(self)
   end
 
   def valid_lexer?
     return false unless TTY::Which.exist?('pygmentize')
-    pyg = TTY::Which.which('pygmentize')
-    res = `#{pyg} -L lexers`
-    lexers = res.scan(/\* ([\w-]+(?:, [\w-]+)*):/).map { |l| l[0] }
-    lexers_a = []
-    lexers.each { |l| lexers_a.concat(l.split(/, /)) }
 
-    lexers_a.include?(self.downcase)
+    MDLess.pygments_lexers.include?(self.downcase)
   end
 end

data/lib/mdless/taskpaper.rb

@@ -3,7 +3,7 @@
 module CLIMarkdown
   module TaskPaper
     TASK_RX = /^(?<indent>(?:    |\t)*?)(?<marker>-)(?<task>\s+\S.*?)$/
-    PROJECT_RX = /^(?<indent>(?:    |\t)*?)(?<project>[^- \t].*?:)(?<tags> @\S+)*$/
+    PROJECT_RX = /^(?<indent>(?:    |\t)*?)(?<project>[^- \t].*?:)(?<tags> +@\S+)*$/
     NOTE_RX = /^(?<indent>(?:    |\t)+)(?<note>(?<!- ).*?(?!:))$/
 
     class << self
@@ -13,8 +13,8 @@ module CLIMarkdown
       def color(key)
         val = nil
         keys = key.split(/[ ,>]/)
-        if @theme.key?(keys[0])
-          val = @theme[keys.shift]
+        if MDLess.theme.key?(keys[0])
+          val = MDLess.theme[keys.shift]
         else
           @log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
           return c([:reset])
@@ -36,25 +36,95 @@ module CLIMarkdown
         end
       end
 
+      def remove_meta(input)
+        first_line = input.split("\n").first
+        if first_line =~ /(?i-m)^---[ \t]*?$/
+          input.sub!(/(?im)^---[ \t]*\n([\s\S]*?)\n[-.]{3}[ \t]*\n/, '')
+        elsif first_line =~ /(?i-m)^[\w ]+:\s+\S+/
+          input.sub!(/(?im)^([\S ]+:[\s\S]*?)+(?=\n\n)/, '')
+        end
+        input
+      end
+
       def is_taskpaper?(input)
-        projects = input.split(PROJECT_RX)
+        return true if MDLess.file =~ /\.taskpaper$/
+
+        projects = sections(input)
+
         tasks = 0
         if projects.count > 1
-          projects.each do |proj|
-            tasks += proj.scan(TASK_RX).count
+          projects.each do |proj, content|
+            tasks += content['content'].scan(TASK_RX).count
           end
         end
 
-        tasks >= 6
+        if tasks >= 6
+          return true
+        else
+          tst = remove_meta(input)
+          tst = tst.gsub(PROJECT_RX, '')
+          tst = tst.gsub(TASK_RX, '')
+          tst = tst.gsub(/^ *\n$/, '')
+          return tst.strip.length == 0
+        end
+      end
+
+      def section(input, string)
+        sects = sections(input)
+        sects_to_s(sects.filter { |k, _| k.downcase =~ string.downcase.to_rx })
+      end
+
+      def sects_to_s(sects)
+        sects.map do |k, v|
+          "#{k}#{v['content']}"
+        end.join("\n")
+      end
+
+      def indent(input, idnt)
+        input.split(/\n/).map do |line|
+          line.sub(/^#{idnt}/, '')
+        end.join("\n")
+      end
+
+      def sections(input)
+        heirarchy = {}
+        sects = input.to_enum(:scan, /(?mix)
+                                      (?<=\n|\A)(?<indent>(?:    |\t)*?)
+                                      (?<project>[^- \t\n].*?:)\s*(?=\n)
+                                      (?<content>.*?)
+                                      (?=\n\k<indent>\S.*?:|\Z)$/).map { Regexp.last_match }
+        sects.each do |sect|
+          heirarchy[sect['project']] = {}
+          heirarchy[sect['project']]['content'] = indent(sect['content'], sect['indent'])
+          heirarchy = heirarchy.merge(sections(sect['content']))
+        end
+
+        heirarchy
       end
 
-      def highlight(input, theme)
-        @theme = theme
+      def list_projects(input)
+        projects = input.to_enum(:scan, PROJECT_RX).map { Regexp.last_match }
+        projects.delete_if { |proj| proj['project'] =~ /^[ \n]*$/ }
+        projects.map! { |proj| "#{color('taskpaper marker')}#{proj['indent']}- #{color('taskpaper project')}#{proj['project'].sub(/:$/, '')}" }
+        projects.join("\n")
+      end
+
+      def highlight(input)
         mc = color('taskpaper marker')
         tc = color('taskpaper task')
         pc = color('taskpaper project')
         nc = color('taskpaper note')
 
+        if MDLess.options[:section]
+          matches = []
+          MDLess.options[:section].each do |sect|
+            matches << section(input, sect)
+          end
+          input = matches.join("\n")
+        end
+
+        input.gsub!(/\t/, '    ')
+
         input.gsub!(PROJECT_RX) do
           m = Regexp.last_match
           "#{m['indent']}#{pc}#{m['project']}#{m['tags']}"

data/lib/mdless/version.rb

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

data/lib/mdless.rb

@@ -20,3 +20,47 @@ require 'mdless/converter'
 module CLIMarkdown
   EXECUTABLE_NAME = 'mdless'
 end
+
+module MDLess
+  class << self
+    include CLIMarkdown::Theme
+    attr_accessor :options, :cols, :file
+
+    def log
+      @log ||= Logger.new($stderr)
+    end
+
+    def log_level(level)
+      @log.level = level
+    end
+
+    def theme
+      @theme ||= load_theme(@options[:theme])
+    end
+
+    def pygments_styles
+      @pygments_styles ||= read_pygments_styles
+    end
+
+    def pygments_lexers
+      @pygments_lexers ||= read_pygments_lexers
+    end
+
+    def read_pygments_styles
+      MDLess.log.info 'Reading Pygments styles'
+      pyg = TTY::Which.which('pygmentize')
+      res = `#{pyg} -L styles`
+      res.scan(/\* ([\w-]+):/).map { |l| l[0] }
+    end
+
+    def read_pygments_lexers
+      MDLess.log.info 'Reading Pygments lexers'
+      pyg = TTY::Which.which('pygmentize')
+      res = `#{pyg} -L lexers`
+      lexers = res.scan(/\* ([\w-]+(?:, [\w-]+)*):/).map { |l| l[0] }
+      lexers_a = []
+      lexers.each { |l| lexers_a.concat(l.split(/, /)) }
+      lexers_a
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.20
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet