mdless 2.0.15 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863102e504ba07c2ab9b018687d50053ca3395206666d1abffcf79997023db9e
-  data.tar.gz: bbba927ea37503308dac7356cb2d72e84e4cf53c5cf28f3f2b210c68b745cbf1
+  metadata.gz: 9d80ed856b198db9752c7ac96f964b2b2e05f7706288aef8fbf901417952a967
+  data.tar.gz: ad820a3d6a885fc2f50decf0b6f52444d267ca84f9b3bbf5f3945cce8413df15
 SHA512:
-  metadata.gz: 92d0edc1d4722074e897981138c585a02fb9c287c8e8fc270885cc19b6274a2490bcd69b92c198c9876d4c4c1bf9b0ec0226c0e97660791fbfdf6c8e85f5592b
-  data.tar.gz: d738066449abc9ee9a8d0331b6ef64db675686cc53c9d0bbf3fa320a63a70c9f33312e0a6fe6c7055caffca7ba13deefcce10ee57f7e3fd7e291a8447e9674fd
+  metadata.gz: 60dcb01d030a0115bb49616dd507c53a2b605dc8f0d28a194092150489c36adfb33450b7ba3c87f54b4048bc6b5114cfce2b914c240e129a2cbf36f4d76ec420
+  data.tar.gz: b67938b0f651c324845d107074f04a647d8b46c60ee09386be627a1ad2d5ff50b08f31ef9a12984a6a209aeaa7d632cb47313c425c01a47f49b6b72b7a1f6022

data/README.md

@@ -60,8 +60,6 @@ The pager used is determined by system configuration in this order of preference
     -h, --help                       Display this screen
     -i, --images=TYPE                Include [local|remote (both)|none] images in output (requires chafa or imgcat, default none).
     -I, --all-images                 Include local and remote images in output (requires imgcat or chafa)
-        --syntax                     Syntax highlight code blocks
-        --links=FORMAT               Link style ([inline, reference, paragraph], default inline, "paragraph" will position reference links after each paragraph)
     -l, --list                       List headers in document and exit
     -p, --[no-]pager                 Formatted output to pager (default on)
     -P                               Disable pager (same as --no-pager)
@@ -71,6 +69,14 @@ The pager used is determined by system configuration in this order of preference
     -v, --version                    Display version number
     -w, --width=COLUMNS              Column width to format for (default: terminal width)
         --[no-]inline_footnotes      Display footnotes immediately after the paragraph that references them
+        --[no-]intra-emphasis        Parse emphasis inside of words (e.g. Mark_down_)
+        --[no-]lax-spacing           Allow lax spacing
+        --links=FORMAT               Link style ([inline, reference, paragraph], default inline,
+                "paragraph" will position reference links after each paragraph)
+        --[no-]syntax                Syntax highlight code blocks
+        --taskpaper=OPTION           Highlight TaskPaper format (true|false|auto)
+        --update_config              Update the configuration file with new keys and current command line options
+        --[no-]wiki-links            Highlight [[wiki links]]
 
 ## Configuration
 

data/lib/mdless/console.rb

@@ -105,14 +105,14 @@ module Redcarpet
         [
           xc,
           color('code_block border'),
-          '-' * @cols,
+          '-' * 20,
           xc,
           "\n",
           color('code_block color'),
           hilite.chomp,
           "\n",
           color('code_block border'),
-          '-' * @cols,
+          '-' * 20,
           xc
         ].join
       end
@@ -204,33 +204,6 @@ module Redcarpet
         "\n\n#{color('hr color')}#{'_' * @cols}#{xc}\n\n"
       end
 
-      def list(contents, list_type)
-        @@listitemid = 0
-        @@listid += 1
-        "<<list#{@@listid}>>#{contents}<</list#{@@listid}>>"
-      end
-
-      def list_item(text, list_type)
-        case list_type
-        when :unordered
-          [
-            "#{color('list bullet')}• ",
-            color('list color'),
-            text,
-            xc
-          ].join('')
-        when :ordered
-          @@listitemid += 1
-          [
-            color('list number'),
-            "#{@@listitemid}. ",
-            color('list color'),
-            text,
-            xc
-          ].join('')
-        end
-      end
-
       def paragraph(text)
         "#{xc}#{text}#{xc}#{x}\n\n"
       end
@@ -510,16 +483,118 @@ module Redcarpet
         end.join("\n")
       end
 
-      def fix_lists(input, indent = 0)
-        input.gsub(%r{(?<line><<list(?<id>\d+)>>(?<content>.*?)<</list\k<id>>>)}m) do
+      def list(contents, list_type)
+        @@listid += 1
+        "<<list#{@@listid}-#{list_type}>>#{contents}<</list#{@@listid}>>"
+      end
+
+      def list_item(text, list_type)
+        @@listitemid += 1
+        case list_type
+        when :unordered
+          "<<listitem#{@@listitemid}-#{list_type}>>#{text.strip}<</listitem#{@@listitemid}>>\n"
+        when :ordered
+          "<<listitem#{@@listitemid}-#{list_type}>>#{text.strip}<</listitem#{@@listitemid}>>\n"
+        end
+      end
+
+      def indent_lines(input, spaces)
+        return nil if input.nil?
+
+        indent = spaces.scan(/ /).count
+
+        lines = input.split(/\n/)
+        line1 = lines.shift
+        body = lines.map { |l| "#{'  ' * (indent + 1)}#{l}" }.join("\n")
+        "#{line1}\n#{body}"
+      end
+
+      def color_list_item(indent, content, type, counter)
+        case type
+        when :unordered
+          [
+            indent,
+            color('list bullet'),
+            "* ",
+            color('list color'),
+            indent_lines(content, indent).strip,
+            xc
+          ].join
+        when :ordered
+          [
+            indent,
+            color('list number'),
+            "#{counter}. ",
+            color('list color'),
+            indent_lines(content, indent).strip,
+            xc
+          ].join
+        end
+      end
+
+      def fix_lists(input)
+        input = nest_lists(input)
+        input = fix_list_spacing(input)
+        fix_list_items(input)
+      end
+
+      def fix_list_spacing(input)
+        input.gsub(/( *\n)+( *)<<listitem/, "\n\\2<<listitem").gsub(/\n{2,}/, "\n\n")
+      end
+
+      def nest_lists(input, indent = 0)
+        input.gsub!(%r{<<list(?<id>\d+)-(?<type>.*?)>>(?<content>.*?)<</list\k<id>>>}m) do
           m = Regexp.last_match
-          fix_lists(m['content'].split(/\n/).map do |l|
+          lines = m['content'].split(/\n/)
+          list = nest_lists(lines.map do |l|
             outdent = l.scan(%r{<</list\d+>>}).count
-            indent += l.scan(/<<list\d+>>/).count
+            indent += l.scan(/<<list\d+-.*?>>/).count
             indent -= outdent
             "#{' ' * indent}#{l}"
           end.join("\n"), indent)
-        end + "\n"
+          next if list.nil?
+
+          "<<main#{m['id']}>>#{list}<</main#{m['id']}>>"
+        end
+
+        input.gsub(/^(?<indent> +)<<main(?<id>\d+)>>(?<content>.*?)<<\/main\k<id>>>/m) do
+          m = Regexp.last_match
+          "#{m['indent']}#{m['content']}"
+        end
+      end
+
+      def normalize_indentation(line)
+        line.gsub(/^([ \t]+)/) do |pre|
+          pre.gsub(/\t/, ' ')
+        end
+      end
+
+      def fix_items(content, last_indent = 0, levels = [0])
+        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 indent == last_indent
+            levels[indent] ||= 0
+            levels[indent] += 1
+          elsif indent < last_indent
+            levels[last_indent] = 0
+            levels[indent] += 1
+            last_indent = indent
+          else
+            levels[indent] = 1
+            last_indent = indent
+          end
+
+          content = m['content'] =~/<<listitem/ ? fix_items(m['content'], indent, levels) : m['content']
+          color_list_item(' ' * indent, 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'])
+        end
       end
 
       def get_headers(input)
@@ -897,7 +972,7 @@ module Redcarpet
         # format links
         input = reference_links(input) if @options[:links] == :reference || @options[:links] == :paragraph
         # lists
-        input = fix_lists(input, 0)
+        input = fix_lists(input)
         input = render_images(input) if @options[:local_images]
         input = highlight_tags(input) if @options[:at_tags] || @options[:taskpaper]
         fix_colors(input)

data/lib/mdless/converter.rb

@@ -61,6 +61,7 @@ module CLIMarkdown
             @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
@@ -70,51 +71,6 @@ module CLIMarkdown
           end
         end
 
-        @options[:syntax_higlight] ||= false
-        opts.on('--syntax', 'Syntax highlight code blocks') do |p|
-          @options[:syntax_higlight] = p
-        end
-
-        @options[:update_config] ||= false
-        opts.on('--update_config', 'Update the configuration file with new keys and current command line options') do
-          @options[:update_config] = true
-        end
-
-        @options[:taskpaper] ||= false
-        opts.on('--taskpaper=OPTION', 'Highlight TaskPaper format (true|false|auto)') do |tp|
-          @options[:taskpaper] = case tp
-                                 when /^[ty1]/
-                                   true
-                                 when /^a/
-                                   :auto
-                                 else
-                                   false
-                                 end
-        end
-
-        @options[: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
-                             when /^:?r/i
-                               :reference
-                             when /^:?p/i
-                               :paragraph
-                             else
-                               :inline
-                             end
-        end
-
-        @options[:lax_spacing] ||= true
-        opts.on('--[no-]lax-spacing', 'Allow lax spacing') do |opt|
-          @options[:lax_spacing] = opt
-        end
-
-        @options[:intra_emphasis] ||= true
-        opts.on('--[no-]intra-emphasis', 'Parse emphasis inside of words (e.g. Mark_down_)') do |opt|
-          @options[:intra_emphasis] = opt
-        end
-
         @options[:list] ||= false
         opts.on('-l', '--list', 'List headers in document and exit') do
           @options[:list] = true
@@ -146,11 +102,6 @@ module CLIMarkdown
           @options[:at_tags] = true
         end
 
-        @options[:wiki_links] ||= false
-        opts.on('--[no-]wiki-links', 'Highlight [[wiki links]]') do |opt|
-          @options[:wiki_links] = opt
-        end
-
         opts.on('-v', '--version', 'Display version number') do
           puts version
           exit
@@ -166,6 +117,68 @@ module CLIMarkdown
                 'Display footnotes immediately after the paragraph that references them') do |p|
           @options[:inline_footnotes] = p
         end
+
+        @options[:intra_emphasis] ||= true
+        opts.on('--[no-]intra-emphasis', 'Parse emphasis inside of words (e.g. Mark_down_)') do |opt|
+          @options[:intra_emphasis] = opt
+        end
+
+        @options[:lax_spacing] ||= true
+        opts.on('--[no-]lax-spacing', 'Allow lax spacing') do |opt|
+          @options[:lax_spacing] = opt
+        end
+
+        @options[: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
+                             when /^:?r/i
+                               :reference
+                             when /^:?p/i
+                               :paragraph
+                             else
+                               :inline
+                             end
+        end
+
+        @options[:syntax_higlight] ||= false
+        opts.on('--[no-]syntax', 'Syntax highlight code blocks') do |p|
+          @options[:syntax_higlight] = p
+        end
+
+        @options[:taskpaper] = if @options[:taskpaper]
+                                 case @options[:taskpaper].to_s
+                                 when /^[ty1]/
+                                   true
+                                 when /^a/
+                                   :auto
+                                 else
+                                   false
+                                 end
+                               else
+                                 false
+                               end
+        opts.on('--taskpaper=OPTION', 'Highlight TaskPaper format (true|false|auto)') do |tp|
+          @options[:taskpaper] = case tp
+                                 when /^[ty1]/
+                                   true
+                                 when /^a/
+                                   :auto
+                                 else
+                                   false
+                                 end
+        end
+
+        @options[:update_config] ||= false
+        opts.on('--update_config', 'Update the configuration file with new keys and current command line options') do
+          @options[:update_config] = true
+        end
+
+        @options[:wiki_links] ||= false
+        opts.on('--[no-]wiki-links', 'Highlight [[wiki links]]') do |opt|
+          @options[:wiki_links] = opt
+        end
       end
 
       begin
@@ -233,11 +246,29 @@ module CLIMarkdown
 
           input.scrub!
           input.gsub!(/\r?\n/, "\n")
+
           if @options[:list]
             puts list_headers(input)
             Process.exit 0
           else
-            @output = markdown.render(input)
+            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 = CLIMarkdown::TaskPaper.highlight(input, @theme)
+              @output = input.highlight_tags(@theme, @log)
+            else
+              @output = markdown.render(input)
+            end
           end
         end
         printout

data/lib/mdless/string.rb

@@ -2,6 +2,55 @@
 
 # String helpers
 class ::String
+  include CLIMarkdown::Colors
+
+  def color(key, theme, log)
+    val = nil
+    keys = key.split(/[ ,>]/)
+    if theme.key?(keys[0])
+      val = theme[keys.shift]
+    else
+      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}")
+        return c([:reset])
+      end
+    end
+    if val.is_a? String
+      val = "x #{val}"
+      res = val.split(/ /).map(&:to_sym)
+      c(res)
+    else
+      c([:reset])
+    end
+  end
+
+  def highlight_tags(theme, log)
+    tag_color = color('at_tags tag', theme, log)
+    value_color = color('at_tags value', theme, log)
+    gsub(/(?<pre>\s|m)(?<tag>@[^ \].?!,("']+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
+      m = Regexp.last_match
+      last_color = m.pre_match.last_color_code
+      [
+        m['pre'],
+        tag_color,
+        m['tag'],
+        m['lparen'],
+        value_color,
+        m['value'],
+        tag_color,
+        m['rparen'],
+        xc,
+        last_color
+      ].join
+    end
+  end
+
   def scrub
     encode('utf-16', invalid: :replace).encode('utf-8')
   end

data/lib/mdless/version.rb

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

metadata

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