mdless 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb39184ea897e4e43081add5c4c70791f4c04af12b4d54f8cb67e1ba262a551
-  data.tar.gz: 0160b5cda00979788b772a7db721abbe46ec3e6c39d2c1a4459b8fc8f04141b1
+  metadata.gz: 863102e504ba07c2ab9b018687d50053ca3395206666d1abffcf79997023db9e
+  data.tar.gz: bbba927ea37503308dac7356cb2d72e84e4cf53c5cf28f3f2b210c68b745cbf1
 SHA512:
-  metadata.gz: 7f1d7fdd5b1b26ca1a1baf8bf9492c5d1ff51ba5b07c16aaeb1dfe43a91ff0e2025196a08e71687da15b380dedcd5649d06e3107e1e449d3f064e5b178b7f11d
-  data.tar.gz: ca412964bf3a3af4dd6d63453ed818d9715615682866e70602f116fe050174e14f21d60c13f11b1b2d236f14637eeeb5711d7c7eb591538cd45808906331600c
+  metadata.gz: 92d0edc1d4722074e897981138c585a02fb9c287c8e8fc270885cc19b6274a2490bcd69b92c198c9876d4c4c1bf9b0ec0226c0e97660791fbfdf6c8e85f5592b
+  data.tar.gz: d738066449abc9ee9a8d0331b6ef64db675686cc53c9d0bbf3fa320a63a70c9f33312e0a6fe6c7055caffca7ba13deefcce10ee57f7e3fd7e291a8447e9674fd

data/lib/mdless/console.rb

@@ -601,8 +601,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 +666,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 +838,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 +856,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

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,7 +229,10 @@ 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

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.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors:
 - Brett Terpstra
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: A pager like less, but for Markdown files