mdless 2.1.13 → 2.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83167ef6642c2dd16d917eb3bb4f41c7c2ac19dc73ba4450a06bd41f3d044294
-  data.tar.gz: 5b172f2f5572d107d7f8c0610fb80932faf289dd5aa1e46ed290bcb57880c916
+  metadata.gz: 9c33009eb5144e58388cddecbb739f8ebe3889202b21838a59fa303cdcf33726
+  data.tar.gz: 6adca397f29c120348707c5eb4af99a443b9f737e60262e1f4f779b33d7d68fb
 SHA512:
-  metadata.gz: c63aa55d2e53d7773c4208868d1bfffecaf93224da8843f11a2a74fb339a77bdb2143a54144ed09deb4253e645c484c017e42ea69196f03163b83331301a6f72
-  data.tar.gz: 1b3ee4f2e46e131d2c2e7a3f015f3eb9dfc57f0382863794f9130e00e34a64d359a9e0b05074568a3c8ec133fcd534ec680df0efb9f4c02c82f6a1728fff2fa4
+  metadata.gz: 1cb103df693efacc6f20ccbfcb73ad73ed5eda5e75ba1143cb8753a7f0a5a3865226c46c6f6a61a1fdb1a8fd29278c4b34b531e2efa3f773cc2688fe13ce5601
+  data.tar.gz: 4b4178f479b323c7079281ebbc1c531586ceebf04de77cb998c391415fcbb708bec357d1bce7312d42ee7cc67d59dc44c1f6dab2ac55a51c3dcd327cc132bc59

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+2.1.15
+
+2.1.14
+: Spaces on a line separating metadata won't break display
+: Preserve line breaks in metadata
+: Failure to display metadata fixed
+
 2.1.13
 : Remove debugging statement
 

data/README.md

@@ -227,7 +227,7 @@ $ gather https://brettterpstra.com/projects/gather-cli/ | mdless
 [fzf](https://github.com/junegunn/fzf) is a tool for selecting files and other menu options with typeahead fuzzy matching. You can set up `mdless` as a previewer when selecting Markdown or TaskPaper files.
 
 ```
-$ ls *.md | fzf --preview 'mdless --taskpaper auto --linebreaks {}'
+$ ls *.md | fzf --preview 'mdless {}'
 ```
 
 ### Fish

data/lib/mdless/console.rb

@@ -262,10 +262,15 @@ module Redcarpet
       end
 
       def paragraph(text)
+        text.scrub!
         out = if MDLess.options[:preserve_linebreaks]
                 "#{xc}#{text.gsub(/ +/, ' ').strip}#{xc}#{x}\n\n"
               else
-                "#{xc}#{text.gsub(/ +/, ' ').gsub(/\n+(?![:-])/, ' ').strip}#{xc}#{x}\n\n"
+                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)
@@ -755,7 +760,7 @@ module Redcarpet
                 line = "#{color('metadata marker')}#{'%' * longest}"
               else
                 line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-                line = "#{color('metadata color')}#{line}"
+                line = "#{color('metadata marker')}% #{color('metadata color')}#{line}\n"
               end
 
               line += "\u00A0" * (longest - line.uncolor.strip.length) + xc
@@ -766,15 +771,16 @@ module Redcarpet
 
         if !in_yaml && first_line =~ /(?i-m)^[\w ]+:\s+\S+/
           MDLess.log.info('Found MMD Headers')
-          input.sub!(/(?i-m)^([\S ]+:[\s\S]*?)+(?=\n\n)/) do |mmd|
+          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 < MDLess.cols ? longest + 1 : MDLess.cols
+
             lines.map do |line|
               line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-              line = "#{color('metadata color')}#{line}"
+              line = "#{color('metadata marker')}%#{color('metadata color')}#{line}  "
               line += "\u00A0" * (longest - line.uncolor.strip.length)
               line + xc
             end.join("\n") + "#{"\u00A0" * longest}#{xc}\n"

data/lib/mdless/string.rb

@@ -74,7 +74,7 @@ class ::String
             line = "#{color('metadata marker')}#{'%' * longest}"
           else
             line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-            line = "#{color('metadata color')}#{line}"
+            line = "#{color('metadata color')}#{line}<br>"
           end
 
           line += "\u00A0" * (longest - line.uncolor.strip.length) + xc
@@ -85,7 +85,7 @@ class ::String
 
     if !in_yaml && first_line =~ /(?i-m)^[\w ]+:\s+\S+/
       MDLess.log.info('Found MMD Headers')
-      input.sub!(/(?i-m)^([\S ]+:[\s\S]*?)+(?=\n\n)/) do |mmd|
+      input.sub!(/(?i-m)^([\S ]+:[\s\S]*?)+(?=\n *\n)/) do |mmd|
         lines = mmd.split(/\n/)
         return mmd if lines.count > 20
 
@@ -93,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')}#{line}"
+          line = "#{color('metadata color')}#{line}<br>"
           line += "\u00A0" * (longest - line.uncolor.strip.length)
           line + xc
         end.join("\n") + "#{"\u00A0" * longest}#{xc}\n"

data/lib/mdless/taskpaper.rb

@@ -61,9 +61,10 @@ module CLIMarkdown
         if tasks >= 6
           return true
         else
-          tst = remove_meta(input)
+          tst = remove_meta(input.dup)
           tst = tst.gsub(PROJECT_RX, '')
           tst = tst.gsub(TASK_RX, '')
+          tst = tst.gsub(NOTE_RX, '')
           tst = tst.gsub(/^ *\n$/, '')
           return tst.strip.length == 0
         end

data/lib/mdless/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.15
 platform: ruby
 authors:
 - Brett Terpstra