mdless 2.1.12 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fbc37210004d25b7867c566bcc21bfa174a9e27bf74a1113659bc8809b187e8
-  data.tar.gz: 493d48b6061f21e408b0ae1ff43cdb47027bc07039e3678876a958c62177f42f
+  metadata.gz: ffc20d85c54af629a9fe7b40cb2d070f4b1747cc83a11c8db247dd41552b3fc7
+  data.tar.gz: 724e9dd1be0e95b076d4d33a166a06096f25295c60c91209c90a1d3e75010b0e
 SHA512:
-  metadata.gz: f9b47996f59764d9324c7f3c63d3bfa62f392b2b71c1e93c4d49bb093af252c6a51baa60ca8d5d43e7d98139bfe9e9c20c868f5a43f136df645514d92deccc6f
-  data.tar.gz: 6327ebca9f23e4e0fa59c0911076d09e12299c3efbfb9c46e096416b3b4fb642a460e90ff52429c739c2ed3f53da1f8f589fe479797058e9160c60427b10d7db
+  metadata.gz: d82b111bdd9266f47d96c56fc5aa3475e29aa2a9076fb25fcaf035f86da4f72cdd91d7ee99b77fef10dcd945ef01cd98caaa7ff29e074d77a9f6fca28ebc81f4
+  data.tar.gz: 8d645cf69412688a8b2e4d370442bbd230c4bb22ee40b73b8d3bdb8e6648bdf804c399ff59607018c5b8dec34a1a11a5c54e12fc1825380c496bbed430f52cd9

data/CHANGELOG.md

@@ -1,4 +1,13 @@
+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
+
 2.1.12
+: Fix list indentation when nesting
 
 2.1.11
 : Better regex for highlighting raw HTML

data/README.md

@@ -147,7 +147,7 @@ You can also use 3 or 6-digit hex codes in place of color names. These can be pr
 
 Some extra (non-color) settings are available for certain keys, e.g. `pad_char` to define the right padding character used on level 1 and 2 headlines. Note that you can change the [Pygments](http://pygments.org/) theme used for syntax highlighting with the code_block.pygments_theme setting. For a list of available styles (assuming you have Pygments installed), use `pygmentize -L styles`.
 
-The display of characters around emphasis and code spans can be configured. By default, the surrounding character for bold is `**`, italic is `_`, and code span is \`. You can leave these keys empty to not display characters at all. For triple-emphasized text, the text will be surrounded by italic and bold characters, in that order.
+The display of characters around emphasis and code spans can be configured. By default, the surrounding character for bold is `**`, italic is `_`, and code span is a backtick. You can leave these keys empty to not display characters at all. For triple-emphasized text, the text will be surrounded by italic and bold characters, in that order.
 
 ```yaml
 emphasis:
@@ -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)
@@ -602,7 +607,7 @@ module Redcarpet
       def indent_lines(input, spaces)
         return nil if input.nil?
 
-        indent = spaces.scan(/\t/).count
+        indent = spaces.scan(/ /).count
 
         lines = input.split(/\n/)
         line1 = lines.shift
@@ -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"
@@ -1073,7 +1079,6 @@ module Redcarpet
         input = reference_links(input) if MDLess.options[:links] == :reference || MDLess.options[:links] == :paragraph
         # lists
         input = fix_lists(input)
-        puts input
         fix_colors(input)
       end
     end

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.12'
+  VERSION = '2.1.14'
 end

metadata

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