mdless 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad40bdc7ff7382f5205104ee7ef2983f1f04a97f9723723265e0efe1abf9ad9
-  data.tar.gz: b39655a8c2bcf3d619ab4dae8fe596bc40a160e22cfeef22d6677296e47f8c89
+  metadata.gz: 60b3541746585a41e0cdd5ef8d078b7c64c3afa7024710f5a0af7d22b33e8722
+  data.tar.gz: 5e877c78b1924f7d34b1b13225702d6c236c75c0055cd7c3c2aea78c1dc802d8
 SHA512:
-  metadata.gz: c3bef39bca518259bd974527b6bd2f834a32db954bc4d6c91fdf2e0e312e705807aa78bd74c3d11f95eb96a510de8c72c493cab704829bea7df2bf38bfd0932f
-  data.tar.gz: 5f28c0eaccca18314dd0c6645e720c27221c81d68ad5500239c830f27ff0737da0e19c2ee75460058de5afe68fdd6361c778849a2da2b40d649a5d2878cea14e
+  metadata.gz: 60bffe2be11c62398ccba8e29c95f786b6eb9cdc0e86cf79dca7b3d29554426e75bf7221d01f6c52270075e8732fe26a554da2948e6a47598d7507dcfb928177
+  data.tar.gz: 44cde0fea6749c4d71a29c044dcece8385663c65e2540a2cbbb24d758895e371917f6e710dd0f599b416412b709b22dd15dfad7a8866b119eb40599eefaa5dfe

data/lib/mdless/converter.rb

@@ -31,6 +31,11 @@ module CLIMarkdown
           'marker' => 'd black on_black',
           'color' => 'd white on_black'
         },
+        'emphasis' => {
+          'bold' => 'b',
+          'italic' => 'u i',
+          'bold-italic' => 'b u i'
+        },
         'h1' => {
           'color' => 'b intense_black on_white',
           'pad' => 'd black on_white',
@@ -122,6 +127,11 @@ module CLIMarkdown
         new_theme = YAML.load(IO.read(theme_file))
         begin
           @theme = theme_defaults.deep_merge(new_theme)
+          # write merged theme back in case there are new keys since
+          # last updated
+          File.open(theme_file,'w') {|f|
+            f.puts @theme.to_yaml
+          }
         rescue
           @log.warn('Error merging user theme')
           @theme = theme_defaults
@@ -172,8 +182,11 @@ module CLIMarkdown
         @options[:local_images] = false
         @options[:remote_images] = false
 
-        if exec_available('imgcat') && ENV['TERM_PROGRAM'] == 'iTerm.app'
-          opts.on('-i', '--images=TYPE', 'Include [local|remote (both)] images in output (requires imgcat and iTerm2, default NONE)' ) do |type|
+
+        opts.on('-i', '--images=TYPE', 'Include [local|remote (both)] images in output (requires imgcat and iTerm2, default NONE)' ) do |type|
+          unless exec_available('imgcat')# && ENV['TERM_PROGRAM'] == 'iTerm.app'
+            @log.warn('images turned on but imgcat not found')
+          else
             if type =~ /^(r|b|a)/i
               @options[:local_images] = true
               @options[:remote_images] = true
@@ -181,7 +194,11 @@ module CLIMarkdown
               @options[:local_images] = true
             end
           end
-          opts.on('-I', '--all-images', 'Include local and remote images in output (requires imgcat and iTerm2)' ) do
+        end
+        opts.on('-I', '--all-images', 'Include local and remote images in output (requires imgcat and iTerm2)' ) do
+          unless exec_available('imgcat')# && ENV['TERM_PROGRAM'] == 'iTerm.app'
+            @log.warn('images turned on but imgcat not found')
+          else
             @options[:local_images] = true
             @options[:remote_images] = true
           end
@@ -802,8 +819,11 @@ module CLIMarkdown
             color('hr color') + '_'*@cols + xc
           end
 
+          # escaped characters
+          line.gsub!(/\\(\S)/,'\1')
+
           # bold, bold/italic
-          line.gsub!(/(?<pre>^|\s)(?<open>[\*_]{2,3})(?<content>[^\*_\s][^\*_]+?[^\*_\s])[\*_]{2,3}/) do |m|
+          line.gsub!(/(?<pre>^|[ "'\(“])(?<open>[\*_]{2,3})(?<content>[^\*_\s][^\*_]+?[^\*_\s])[\*_]{2,3}/) do |m|
             match = Regexp.last_match
             last = find_color(match.pre_match, true)
             counter = i
@@ -811,12 +831,12 @@ module CLIMarkdown
               counter -= 1
               last = find_color(lines[counter])
             end
-            emph = match['open'].length == 2 ? c([:b]) : c(%i[b u i])
+            emph = match['open'].length == 2 ? color('emphasis bold') : color('emphasis bold-italic')
             "#{match['pre']}#{emph}#{match['content']}" + (last ? last : xc)
           end
 
           # italic
-          line.gsub!(/(^|\s)[\*_]([^\*_\s][^\*_]+?[^\*_\s])[\*_]/) do |m|
+          line.gsub!(/(?<pre>^|[ "'\(“])[\*_](?<content>[^\*_\s][^\*_]+?[^\*_\s])[\*_]/) do |m|
             match = Regexp.last_match
             last = find_color(match.pre_match, true)
             counter = i
@@ -824,7 +844,7 @@ module CLIMarkdown
               counter -= 1
               last = find_color(lines[counter])
             end
-            "#{match[1]}#{c(%i[u i])}#{match[2]}" + (last ? last : xc)
+            "#{match['pre']}#{color('emphasis italic')}#{match[2]}" + (last ? last : xc)
           end
 
           # equations

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

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