mdless 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6889fdd8408bf2d11ef61f18261c57f50cd806f41595acba1d5dd17e439c95b8
-  data.tar.gz: 92ba0555ae5ddd4092a60d5dfdb9c5c7e2a5d6f7914eb4c140bbb1bbc84959fc
+  metadata.gz: 127a5e5dccfd208faa3f32410b58949ca30929791f985324bb886c65eac0706f
+  data.tar.gz: 50a44aa8436e851e75be92f6ec53b96d39625309283d7f550e92831a1da90ed1
 SHA512:
-  metadata.gz: 323b2d8fae576af6fb4fee090d21aef0897f5f3024c6928c648f95944f51395b44e53bef1aa46462094dd61326d29e3f17a173455cb6351616e82c35c377110c
-  data.tar.gz: 3601996987a8f4fdb7c4fcc685474ee5895ea4252274acb6c0e2caa5aa766f926ba2e66b694a6ad7fe4f865da69f3f1f919800ad82c15573580a0088a6fce234
+  metadata.gz: 5f24dc6c4eec6d0f685f15dc43ab7d4b34b323591860ec03c08ff74a3aa7cf7add47278456fcb64ebfba5b6e8509871fb0950e6b2eb23fddfad2a2d4677f4905
+  data.tar.gz: 2fe9751c87edccb87f67f378dff33893d46e22ce56469b0b2074de8795deba021aaf0485ce68e4705412d7c2ba4c7277625168b6514ecf867b09a3c3f10064d0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2.1.4
+: In addition to color names, you can now use 3 or 6-digit hex codes, prefix with "bg" or "on_" to affect background color
+: Better highlighting of h1/h2 when header contains a link
+: List items with multiple paragraphs incorrectly highlighted
+
 2.1.3
 : Respect :width setting in config
 

data/README.md

@@ -17,18 +17,29 @@ I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a
 - Normalize spacing and link formatting
 - Display footnotes after each paragraph
 - Inline image display (local, optionally remote) (with compatible tools like imgcat or chafa)
-- Syntax highlighting when [Pygments](http://pygments.org/) is installed
+- Syntax highlighting of code blocks when [Pygments](http://pygments.org/) is installed
 - List headlines in document
     - Display single section of the document based on headlines
+- Configurable Markdown options
 - Customizable colors
 - Add iTerm marks for h1-3 navigation when pager is disabled
+- TaskPaper syntax detection and highlighting
 
 ## Installation
 
+### Gem install
+
     gem install mdless
 
 If you run into errors, try `gem install --user-install mdless`, or `sudo gem install mdless` (in that order).
 
+### Homebrew
+
+mdless is also available via Homebrew (directly).
+
+    brew install mdless
+
+
 ### Dependencies
 
 To render images, you need `imgcat` or `chafa` installed (`brew install chafa`).
@@ -132,6 +143,8 @@ h1:
 
 Font and color settings are set using a string of color names and modifiers. A typical string looks like `b red on_white`, which would give you a bold red font on a white background. In the YAML settings file there's no need for quotes, just put the string following the colon for the setting.
 
+You can also use 3 or 6-digit hex codes in place of color names. These can be prefixed with `bg` or `on_` to affect background colors, e.g. `bgFF0ACC`. The codes are case-insensitive and can be combined with emphasis modifiers like `b` or `u`.
+
 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.
@@ -199,6 +212,8 @@ mdless --taskpaper=auto -@ "${FILE_PATH}" && exit 5
 ;;
 ```
 
+Thanks to Ralf Hülsmann for contributing!
+
 ### Gather
 
 [Gather](https://brettterpstra.com/projects/gather-cli/) is a tool for converting web pages to Markdown. You can use it with mdless to create a Lynx-style web browser:

data/lib/mdless/colors.rb

@@ -70,7 +70,7 @@ module CLIMarkdown
     def last_color_code
       m = scan(ESCAPE_REGEX)
 
-      em = ['0']
+      em = []
       fg = nil
       bg = nil
       rgbf = nil
@@ -81,15 +81,12 @@ module CLIMarkdown
         when '0'
           em = ['0']
           fg, bg, rgbf, rgbb = nil
-        when /^[34]8/
-          case c
-          when /^3/
-            fg = nil
-            rgbf = c
-          when /^4/
-            bg = nil
-            rgbb = c
-          end
+        when /;38;/
+          fg = nil
+          rgbf = c
+        when /;48;/
+          bg = nil
+          rgbb = c
         else
           c.split(/;/).each do |i|
             x = i.to_i
@@ -144,9 +141,9 @@ module CLIMarkdown
 
       line += self.match(/^\s*/)[0].gsub(/\t/,'    ')
       input = self.dup # .gsub(/(\w-)(\w)/,'\1 \2')
-      input.gsub!(/\[.*?\]\(.*?\)/) do |link|
-        link.gsub(/ /, "\u00A0")
-      end
+      # input.gsub!(/\[.*?\]\(.*?\)/) do |link|
+      #   link.gsub(/ /, "\u00A0")
+      # end
       input.split(/\s+/).each do |word|
         last_ansi = line.scan(/\e\[[\d;]+m/)[-1] || ''
         if visible_width + word.size_clean >= width
@@ -170,14 +167,15 @@ module CLIMarkdown
     def c(args)
       out = []
 
-      args.each {|arg|
-        if COLORS.key? arg
+      args.each do |arg|
+        if arg.to_s =~ /^([bf]g|on_)?([a-f0-9]{3}|[a-f0-9]{6})$/i
+          out.concat(rgb(arg.to_s))
+        elsif COLORS.key? arg
           out << COLORS[arg]
         end
-      }
-
-      if out.size > 0
-        "\e[#{out.sort.join(';')}m"
+      end
+      if !out.empty?
+        "\e[#{out.join(';')}m"
       else
         ''
       end
@@ -185,6 +183,20 @@ module CLIMarkdown
 
     private
 
+    def rgb(hex)
+      is_bg = hex.match(/^(bg|on_)/) ? true : false
+      hex_string = hex.sub(/^(bg|on_)?(.{3}|.{6})/, '\2')
+      hex_string.gsub!(/(.)/, '\1\1') if hex_string.length == 3
+
+      parts = hex_string.match(/(?<r>..)(?<g>..)(?<b>..)/)
+      t = []
+      %w[r g b].each do |e|
+        t << parts[e].hex
+      end
+
+      [is_bg ? 48 : 38, 2].concat(t)
+    end
+
     def xc(foreground=:x)
       c([foreground])
     end

data/lib/mdless/console.rb

@@ -142,6 +142,7 @@ module Redcarpet
       def color(key)
         val = nil
         keys = key.split(/[ ,>]/)
+
         if MDLess.theme.key?(keys[0])
           val = MDLess.theme[keys.shift]
         else
@@ -192,17 +193,21 @@ module Redcarpet
         pad = ''
         ansi = ''
         text.clean_header_ids!
+        uncolored = text.uncolor.gsub(/<<(pre|post)\d+>>/, '')
+        uncolored.sub!(/\[(.*?)\]\(.*?\)/, '[\1][xxx]') if MDLess.options[:links] != :inline
+
+        text_length = uncolored.length
         case header_level
         when 1
           ansi = color('h1 color')
           pad = color('h1 pad')
           char = MDLess.theme['h1']['pad_char'] || '='
-          pad += text.length + 2 > MDLess.cols ? char * text.length : char * (MDLess.cols - (text.length + 1))
+          pad += text_length + 2 > MDLess.cols ? char * text_length : char * (MDLess.cols - (text_length + 1))
         when 2
           ansi = color('h2 color')
           pad = color('h2 pad')
           char = MDLess.theme['h2']['pad_char'] || '-'
-          pad += text.length + 2 > MDLess.cols ? char * text.length : char * (MDLess.cols - (text.length + 1))
+          pad += text_length + 2 > MDLess.cols ? char * text_length : char * (MDLess.cols - (text_length + 1))
         when 3
           ansi = color('h3 color')
         when 4
@@ -236,6 +241,10 @@ module Redcarpet
         end
       end
 
+      def uncolor_grafs(text)
+        text.gsub(/#{Regexp.escape(color('text'))}/, color('list color'))
+      end
+
       @table_cols = nil
 
       def table_header_row
@@ -294,7 +303,7 @@ module Redcarpet
       end
 
       def codespan(code)
-        [
+        out = [
           pre_element,
           color('code_span marker'),
           MDLess.theme['code_span']['character'],
@@ -304,7 +313,7 @@ module Redcarpet
           MDLess.theme['code_span']['character'],
           xc,
           post_element
-        ].join('')
+        ].join
       end
 
       def double_emphasis(text)
@@ -617,7 +626,7 @@ module Redcarpet
           end
 
           content = m['content'] =~/<<listitem/ ? fix_items(m['content'], indent, levels) : m['content']
-          color_list_item(' ' * indent, content, m['type'].to_sym, levels[indent])
+          color_list_item(' ' * indent, uncolor_grafs(content), m['type'].to_sym, levels[indent])
         end
       end
 
@@ -822,8 +831,9 @@ module Redcarpet
       def fix_colors(input)
         input.gsub(/<<pre(?<id>\d+)>>(?<content>.*?)<<post\k<id>>>/m) do
           m = Regexp.last_match
-          pre = m.pre_match
+          pre = m.pre_match.gsub(/<<pre(?<id>\d+)>>.*?<<post\k<id>>>/m, '')
           last_color = pre.last_color_code
+
           "#{fix_colors(m['content'])}#{last_color}"
         end.gsub(/<<(pre|post)\d+>>/, '')
       end

data/lib/mdless/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet