mdless 1.0.32 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa89ffe14d9828b457116dde396a11bde06bbe58a258f721b5d0c0d2e5d381bf
-  data.tar.gz: 2b12d4353cf2f836b0dea6491f7671fae7d269e8b3617cfc92ba8f90e58da0ce
+  metadata.gz: 6dce520c83c9816d3124e96eefd5f76af0fdb7f1b98515d1b1cbe2dd602fa34e
+  data.tar.gz: fa054888f473b9cab79cdd4446d39092d0e947f20e4feecccc07ff47ab55fc55
 SHA512:
-  metadata.gz: 47a0731cd6e4a7febf475f253406938726deebb1e1cbb5808e2048789ab5f695ba9e234656ce40316978eb12e7da2d08b4bed3b42d27614a89fd8ed2ceffa725
-  data.tar.gz: 9d74ae761471b840e816e4b15ceb81697bbccdf7331d5431a0845727599967383c361c890008bc795312f91374f243a0f6696b953e6c38b197377913a64b6b86
+  metadata.gz: e932ba8df8b972fb44d99e6e834abf8068c3c419c7f174b4ca29075dc5d03ab186a8fb5fdf3ff2d4e4ba8679db8f5f493761ebfd4d89f3192f009dcf262aae86
+  data.tar.gz: a2862dcbb7c98960b115afa053b9585e0094489e531ca6daebbf0ce961b36e4f933170ba0ed42329c3cf779e6bcafd00436e765380bfc87a47579564d6001f48

data/lib/mdless/converter.rb

@@ -22,11 +22,11 @@ module CLIMarkdown
         opts.banner = "#{version} by Brett Terpstra\n\n> Usage: #{CLIMarkdown::EXECUTABLE_NAME} [options] [path]\n\n"
 
         @options[:color] = true
-        opts.on( '-c', '--[no-]color', 'Colorize output (default on)' ) do |c|
+        opts.on('-c', '--[no-]color', 'Colorize output (default on)') do |c|
           @options[:color] = c
         end
 
-        opts.on( '-d', '--debug LEVEL', 'Level of debug messages to output' ) do |level|
+        opts.on('-d', '--debug LEVEL', 'Level of debug messages to output') do |level|
           if level.to_i > 0 && level.to_i < 5
             @log.level = 5 - level.to_i
           else
@@ -35,7 +35,7 @@ module CLIMarkdown
           end
         end
 
-        opts.on( '-h', '--help', 'Display this screen' ) do
+        opts.on('-h', '--help', 'Display this screen') do
           puts opts
           exit
         end
@@ -54,8 +54,8 @@ module CLIMarkdown
             end
           end
         end
-        opts.on('-I', '--all-images', 'Include local and remote images in output (requires imgcat or chafa)' ) do
-          if exec_available('imgcat') || exec_available('chafa')# && ENV['TERM_PROGRAM'] == 'iTerm.app'
+        opts.on('-I', '--all-images', 'Include local and remote images in output (requires imgcat or chafa)') do
+          if exec_available('imgcat') || exec_available('chafa') # && ENV['TERM_PROGRAM'] == 'iTerm.app'
             @options[:local_images] = true
             @options[:remote_images] = true
           else
@@ -64,51 +64,51 @@ module CLIMarkdown
         end
 
         @options[:links] = :inline
-        opts.on( '--links=FORMAT', 'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]' ) do |format|
+        opts.on('--links=FORMAT', 'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]') do |format|
           if format =~ /^r/i
             @options[:links] = :reference
           end
         end
 
         @options[:list] = false
-        opts.on( '-l', '--list', 'List headers in document and exit' ) do
+        opts.on('-l', '--list', 'List headers in document and exit' ) do
           @options[:list] = true
         end
 
         @options[:pager] = true
-        opts.on( '-p', '--[no-]pager', 'Formatted output to pager (default on)' ) do |p|
+        opts.on('-p', '--[no-]pager', 'Formatted output to pager (default on)') do |p|
           @options[:pager] = p
         end
 
-        opts.on( '-P', 'Disable pager (same as --no-pager)' ) do
+        opts.on('-P', 'Disable pager (same as --no-pager)') do
           @options[:pager] = false
         end
 
         @options[:section] = nil
-        opts.on( '-s', '--section=NUMBER', 'Output only a headline-based section of the input (numeric from --list)' ) do |section|
-          @options[:section] = section.to_i
+        opts.on('-s', '--section=NUMBER[,NUMBER]', 'Output only a headline-based section of the input (numeric from --list)') do |section|
+          @options[:section] = section.split(/ *, */).map(&:strip).map(&:to_i)
         end
 
         @options[:theme] = 'default'
-        opts.on( '-t', '--theme=THEME_NAME', 'Specify an alternate color theme to load' ) do |theme|
+        opts.on('-t', '--theme=THEME_NAME', 'Specify an alternate color theme to load') do |theme|
           @options[:theme] = theme
         end
 
-        opts.on( '-v', '--version', 'Display version number' ) do
+        opts.on('-v', '--version', 'Display version number') do
           puts version
           exit
         end
 
-        @options[:width] = %x{tput cols}.strip.to_i
-        opts.on( '-w', '--width=COLUMNS', 'Column width to format for (default terminal width)' ) do |columns|
+        @options[:width] = `tput cols`.strip.to_i
+        opts.on('-w', '--width=COLUMNS', 'Column width to format for (default: terminal width)') do |columns|
           @options[:width] = columns.to_i
         end
       end
 
       begin
         optparse.parse!
-      rescue OptionParser::ParseError => pe
-        $stderr.puts "error: #{pe.message}"
+      rescue OptionParser::ParseError => e
+        warn "error: #{e.message}"
         exit 1
       end
 
@@ -122,7 +122,7 @@ module CLIMarkdown
       @ref_links = {}
       @footnotes = {}
 
-      if args.length > 0
+      if !args.empty?
         files = args.delete_if { |f| !File.exist?(f) }
         files.each do |file|
           @log.info(%(Processing "#{file}"))
@@ -488,6 +488,10 @@ module CLIMarkdown
     end
 
     def convert_markdown(input)
+      ## Replace setex headers with ATX
+      input.gsub!(/^([^\n]+)\n={3,}\s*$/m, "# \\1\n")
+      input.gsub!(/^([^\n]+?)\n-{3,}\s*$/m, "## \\1\n")
+
       @headers = get_headers(input)
       input += "\n\n@@@"
       # yaml/MMD headers
@@ -527,7 +531,6 @@ module CLIMarkdown
 
       end
 
-
       # Gather reference links
       input.gsub!(/^\s{,3}(?<![\e*])\[\b(.+)\b\]: +(.+)/) do |m|
         match = Regexp.last_match
@@ -544,34 +547,34 @@ module CLIMarkdown
       end
 
       if @options[:section]
-        in_section = false
-        top_level = 1
         new_content = []
-
-        input.split(/\n/).each {|graf|
-          if graf =~ /^(#+) *(.*?)( *#+)?$/
-            level = $1.length
-            title = $2
-
-            if in_section
-              if level >= top_level
+        @options[:section].each do |sect|
+          in_section = false
+          top_level = 1
+          input.split(/\n/).each do |graf|
+            if graf =~ /^(#+) *(.*?)( *#+)?$/
+              m = Regexp.last_match
+              level = m[1].length
+              title = m[2]
+              if in_section
+                if level >= top_level
+                  new_content.push(graf)
+                else
+                  in_section = false
+                  break
+                end
+              elsif title.downcase == @headers[sect - 1][1].downcase
+                in_section = true
+                top_level = level + 1
                 new_content.push(graf)
               else
-                in_section = false
-                break
+                next
               end
-            elsif title.downcase == "#{@headers[@options[:section] - 1][1].downcase}"
-              in_section = true
-              top_level = level + 1
+            elsif in_section
               new_content.push(graf)
-            else
-              next
             end
-          elsif in_section
-            new_content.push(graf)
           end
-        }
-
+        end
         input = new_content.join("\n")
       end
 
@@ -623,23 +626,23 @@ module CLIMarkdown
       input.gsub!(/(?i-m)(^[ \t]*[`~]{3,})([\s\S]*?)\n([\s\S]*?)\1/m) do
         language = nil
         m = Regexp.last_match
-        first_indent = m[1].gsub(/\t/,'    ').match(/^ */)[0].size
+        first_indent = m[1].gsub(/\t/, '    ').match(/^ */)[0].size
 
-        if m[2] && m[2].strip.length > 0
+        if m[2] && !m[2].strip.empty?
           language = m[2].strip.split(/ /)[0]
-          code_block = pad_max(m[3].to_s,'')
-          leader = language ? language : 'code'
+          code_block = pad_max(m[3].to_s, '')
+          leader = language || 'code'
         else
           first_line = m[3].to_s.split(/\n/)[0]
 
-          if first_line =~ /^\s*#!.*\/.+/
-            shebang = first_line.match(/^\s*#!.*\/(?:env )?([^\/]+)$/)
+          if first_line =~ %r{^\s*#!.*/.+}
+            shebang = first_line.match(%r{^\s*#!.*/(?:env )?([^/]+)$})
             language = shebang[1]
             code_block = m[3]
-            leader = shebang[1] ? shebang[1] : 'code'
+            leader = shebang[1] || 'code'
           else
             code_block = pad_max(m[3].to_s, "#{color('code_block eol')}¬")
-            leader = language ? language : 'code'
+            leader = language || 'code'
           end
         end
         leader += xc

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.32'
+  VERSION = '1.0.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.35
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2023-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake