mdless 1.0.7 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b79330028da2d98251af174cfb9f0ae60294efa6e24de4cff88d245c351340f3
-  data.tar.gz: 22c669286e9486f739badc7e74819e1989fb00fc1f415c9e3fd371e60b1a6026
+  metadata.gz: 1d6da924affdfcd0e5be75373d3e8be870fe4300a63c7a462d8fb35fed5d9c1d
+  data.tar.gz: 9ac90ee12218b43104728cdffdff67c265f53d0f6cc4ac92a7adf1eaa59e8397
 SHA512:
-  metadata.gz: 719d4170904c7fd9bc21e5cc4f19ca1a9f5a197d891e211bb29bfd1eecb94cf7d1b9af22943dc253bae4a2ffa0baa91233aae84005752bc5b5f1660ff539dcfa
-  data.tar.gz: e69bbfb47daf84166fe3cf930601a5fbbaedbd57453c9361547c3b1c6c9cdfb170b4c4a641793a497f23547a3781097e47100a3a8272a8820f4faeb6d4f4de8a
+  metadata.gz: 19c6121272e4975a75acc7e7e60a5cd00f842341a560fb795faa125ec5ebcfad794470d44932d142620a60c8d5627a127c7e95c057e5f2904ac821ed40041dc5
+  data.tar.gz: 4e6eeeb8179b8981675153ac389e90e532c33939c4df4d1f00d5a773c4c547533519bfaf4a32a7e87ea0f0425ab9431d96a3aae9afb0cc19b96cc6c8cb798589

data/README.md

@@ -21,6 +21,7 @@ I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a
 - List headlines in document
     - Display single section of the document based on headlines
 - Customizable colors
+- Add iTerm marks for h1-3 navigation when pager is disabled
 
 ## Installation
 

data/lib/mdless/converter.rb

@@ -154,6 +154,7 @@ module CLIMarkdown
         $stderr.puts "No input"
         Process.exit 1
       end
+
     end
 
     def color(key)
@@ -209,6 +210,7 @@ module CLIMarkdown
           ]
         }
       end
+
       @headers
     end
 
@@ -269,11 +271,15 @@ module CLIMarkdown
       first = true
       input.split(/\n/).map{|line|
         if first
-          first = false
-          line.gsub!(/\|/, "#{color('table border')}|#{color('table header')}")
-        elsif line.strip =~ /^[|:\- ]+$/
+          if line =~ /^\+-+/
+            line.gsub!(/^/, color('table border'))
+          else
+            first = false
+            line.gsub!(/\|/, "#{color('table border')}|#{color('table header')}")
+          end
+        elsif line.strip =~ /^[|:\- +]+$/
           line.gsub!(/^(.*)$/, "#{color('table border')}\\1#{color('table color')}")
-          line.gsub!(/([:\-]+)/,"#{color('table divider')}\\1#{color('table border')}")
+          line.gsub!(/([:\-+]+)/,"#{color('table divider')}\\1#{color('table border')}")
         else
           line.gsub!(/\|/, "#{color('table border')}|#{color('table color')}")
         end
@@ -281,6 +287,7 @@ module CLIMarkdown
     end
 
     def cleanup_tables(input)
+
       in_table = false
       header_row = false
       all_content = []
@@ -307,6 +314,7 @@ module CLIMarkdown
               end
 
               table = this_table.join("\n").strip
+
               begin
                 formatted = MDTableCleanup.new(table)
                 res = formatted.to_md
@@ -331,6 +339,7 @@ module CLIMarkdown
 
     def clean_markers(input)
       input.gsub!(/^(\e\[[\d;]+m)?[%~] ?/,'\1')
+      input.gsub!(/(\e\[[\d;]+m)?@@@(\e\[[\d;]+m)?$/,'')
       input
     end
 
@@ -446,7 +455,7 @@ module CLIMarkdown
             new_code_line,
             xc
           ].join
-        end.join("\n") + "\n"
+        end.join("\n")
       end
 
       [
@@ -473,6 +482,7 @@ module CLIMarkdown
 
     def convert_markdown(input)
       @headers = get_headers(input)
+      input += "\n\n@@@"
       # yaml/MMD headers
       in_yaml = false
       if input.split("\n")[0] =~ /(?i-m)^---[ \t]*?(\n|$)/
@@ -793,8 +803,8 @@ module CLIMarkdown
 
       # Headlines
       @headers.each {|h|
-        input.sub!(/^#{h[2]}/) do |m|
-          pad = ""
+        input.sub!(/^#{Regexp.escape(h[2])}/m) do |m|
+          pad = ''
           ansi = ''
           case h[0].length
           when 1
@@ -928,9 +938,13 @@ module CLIMarkdown
         end
       end
 
-      read_io.close
-      write_io.write(text)
-      write_io.close
+      begin
+        read_io.close
+        write_io.write(text)
+        write_io.close
+      rescue SystemCallError => e
+        exit 1
+      end
 
       _, status = Process.waitpid2(pid)
       status.success?

data/lib/mdless/tables.rb

@@ -1,6 +1,8 @@
 module CLIMarkdown
   class MDTableCleanup
 
+    PAD_CHAR = '⎕'
+
     def initialize(input)
       @string = input
       @format_row = []
@@ -25,10 +27,11 @@ module CLIMarkdown
       end
 
       format.each_with_index {|cell, i|
+        cell.strip!
         f = 'left'
         if cell =~ /^:.*?:$/
           f = 'center'
-        elsif cell =~ /:$/
+        elsif cell =~ /[^:]+:$/
           f = 'right'
         else
           f = 'just'
@@ -81,13 +84,13 @@ module CLIMarkdown
     def pad(string,type,length)
       string.strip!
       if type == 'center'
-        string.center(length, ' ')
+        string.center(length, PAD_CHAR)
       elsif type == 'right'
-        string.rjust(length, ' ')
+        string.rjust(length, PAD_CHAR)
       elsif type == 'left'
-        string.ljust(length, ' ')
+        string.ljust(length, PAD_CHAR)
       else
-        string.ljust(length, ' ')
+        string.ljust(length, PAD_CHAR)
       end
     end
 
@@ -114,6 +117,14 @@ module CLIMarkdown
       "|#{output.join('|')}|"
     end
 
+    def table_border
+      output = []
+      @format_row.each_with_index do |column, i|
+        output.push separator(column_width(i), column)
+      end
+      "+#{output.join('+').gsub(/:/,'-')}+"
+    end
+
     def to_md
       output = []
       t = table.clone
@@ -123,7 +134,12 @@ module CLIMarkdown
         output.push("| #{row.join(' | ').lstrip} |")
       end
       output.insert(1, header_separator_row)
-      output.join("\n")
+      output.insert(0, table_border)
+      output.push(table_border)
+
+      output.join("\n").gsub(/((?<=\| )#{PAD_CHAR}+|#{PAD_CHAR}+(?= \|))/) {|m|
+        " "*m.length
+      }
     end
   end
 end

data/lib/mdless/theme.rb

@@ -80,7 +80,8 @@ module CLIMarkdown
           'border' => 'd black',
           'header' => 'yellow',
           'divider' => 'b black',
-          'color' => 'white'
+          'color' => 'white',
+          'bg' => 'on_black'
         },
         'html' => {
           'brackets' => 'd yellow on_black',

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.7'
+  VERSION = '1.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.13
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A pager like less, but for Markdown files