mdless 2.0.14 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb39184ea897e4e43081add5c4c70791f4c04af12b4d54f8cb67e1ba262a551
-  data.tar.gz: 0160b5cda00979788b772a7db721abbe46ec3e6c39d2c1a4459b8fc8f04141b1
+  metadata.gz: 3c2164454fac4fd82af1ef1594166585de749e87cca73c7c83c25c38c3288dd9
+  data.tar.gz: 7b2008f35bd4ddc66fac4438fda186964a538ef0715739410b0b4c429323d96b
 SHA512:
-  metadata.gz: 7f1d7fdd5b1b26ca1a1baf8bf9492c5d1ff51ba5b07c16aaeb1dfe43a91ff0e2025196a08e71687da15b380dedcd5649d06e3107e1e449d3f064e5b178b7f11d
-  data.tar.gz: ca412964bf3a3af4dd6d63453ed818d9715615682866e70602f116fe050174e14f21d60c13f11b1b2d236f14637eeeb5711d7c7eb591538cd45808906331600c
+  metadata.gz: e119669e34faaa577b8956eb5817f3b391887108e425b0cb5fcb630f14ea5aa6ffa3282c531c7602fc07912c7a75299bd10169d9ba95375485c664226f30a930
+  data.tar.gz: caae8bb09f9c48e25ad144b401ff74a58a379bb5b10b63ffa66c3afef707ccd39af6699a7301c3467ba180395d8e4ab025cd9a10900d44ae7dfafadde2954fa3

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)
@@ -601,8 +676,27 @@ module Redcarpet
       def preprocess(input)
         in_yaml = false
 
+        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
+
         input = color_meta(input)
 
+        if @options[:taskpaper]
+          input = CLIMarkdown::TaskPaper.highlight(input, @theme)
+          input = highlight_tags(input)
+          return input
+        end
+
+
         ## Replace setex headers with ATX
         input.gsub!(/^([^\n]+)\n={2,}\s*$/m, "# \\1\n")
         input.gsub!(/^([^\n]+?)\n-{2,}\s*$/m, "## \\1\n")
@@ -647,20 +741,6 @@ module Redcarpet
           "#{color('dd term')}#{m['term']}#{xc}#{color('dd color')}#{color_dd_def(m['def'])}"
         end
 
-        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
-
-        input = CLIMarkdown::TaskPaper.highlight(input, @theme) if @options[:taskpaper]
-
         input
       end
 
@@ -833,7 +913,7 @@ module Redcarpet
       def highlight_tags(input)
         tag_color = color('at_tags tag')
         value_color = color('at_tags value')
-        input.gsub(/(?<pre>\s|m)(?<tag>@[^ ("']+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
+        input.gsub(/(?<pre>\s|m)(?<tag>@[^ \].?!,("']+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
           m = Regexp.last_match
           last_color = m.pre_match.last_color_code
           [
@@ -851,9 +931,28 @@ module Redcarpet
         end
       end
 
+      def highlight_wiki_links(input)
+        input.gsub(/\[\[(.*?)\]\]/) do
+          content = Regexp.last_match(1)
+          [
+            pre_element,
+            color('link brackets'),
+            '[[',
+            color('link text'),
+            content,
+            color('link brackets'),
+            ']]',
+            xc,
+            post_element
+          ].join
+        end
+      end
+
       def postprocess(input)
         input.scrub!
 
+        input = highlight_wiki_links(input) if @options[:wiki_links]
+
         if @options[:inline_footnotes]
           input = insert_footnotes(input)
         else
@@ -873,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

@@ -146,6 +146,11 @@ 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
@@ -224,12 +229,33 @@ module CLIMarkdown
           rescue StandardError
             input = IO.read(file)
           end
-          input.gsub!(/\r?\n/, "\n").scrub!
+          raise 'Nil input' if input.nil?
+
+          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/taskpaper.rb

@@ -2,8 +2,8 @@
 
 module CLIMarkdown
   module TaskPaper
-    TASK_RX = /^(?<indent>(?:    |\t)+)(?<marker>-)(?<task>\s+\S.*?)$/
-    PROJECT_RX = /^(?<indent>(?:    |\t)*)(?<project>\S.*?:)(?<tags> @\S+)*$/
+    TASK_RX = /^(?<indent>(?:    |\t)*?)(?<marker>-)(?<task>\s+\S.*?)$/
+    PROJECT_RX = /^(?<indent>(?:    |\t)*?)(?<project>[^- \t].*?:)(?<tags> @\S+)*$/
     NOTE_RX = /^(?<indent>(?:    |\t)+)(?<note>(?<!- ).*?(?!:))$/
 
     class << self
@@ -39,8 +39,10 @@ module CLIMarkdown
       def is_taskpaper?(input)
         projects = input.split(PROJECT_RX)
         tasks = 0
-        projects.each do |proj|
-          tasks += proj.scan(TASK_RX).count
+        if projects.count > 1
+          projects.each do |proj|
+            tasks += proj.scan(TASK_RX).count
+          end
         end
 
         tasks >= 6

data/lib/mdless/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.16
 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