marvi 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0110473458c01229add5274f0ab0df77dad55587286ee01c426612fa0505707
-  data.tar.gz: 8e59b8386b4fb283613a2fc81d2841473ccd78eaa216a4608e10c17ae62c61b0
+  metadata.gz: d5ff0488e214dd427a028dabe9d240bee43e48ac27cef895e7f8584b41695435
+  data.tar.gz: 71dcd3de576d8926b90cae6ec4b79732be3627b85922351585b624b064eafb94
 SHA512:
-  metadata.gz: 3abaf2190555600e5e04cd0a04d7176d6ef5b8384afc902cff76389ec782a448bd99609cf2474d7f62827bc24750514b7517cf780b61739c327a665bb3cc9821
-  data.tar.gz: 2caddfb8de48b8fc5f6c894f839d06239b57845993a67f576f8cde2cb6591509d3167dbe35d11636e1c03f5cb140e2c16cfeec945bf8204eeb4095f3a31c8bcb
+  metadata.gz: 1f90d2999b6336d1fa26f8ef441c8e51e551f4f7d229633053acc9ab8418fe115bcd6ea3f8fa3b67ce678781b29198acc33fd1ed69f591611a47bc97b456901c
+  data.tar.gz: 82bcdfbe5166bcd2f48d2367da468df0290c89e831d16fa06dced445dba98a2ba0846c659a87e9f69a1dd2e68c900f9cccdaaa57790bb0f35ddcb2c4b8d8dc0e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [0.4.2] - 2026-05-31
+
+- Add left/right padding in the curses pager so content no longer sits flush against the terminal edges. Padding scales with terminal width.
+- Render every line of a multi-line blockquote with its `│ ` prefix.
+- Stop emitting an empty `│ ` line at the end of blockquotes.
+- Collapse consecutive blank lines so block-level elements are separated by a single blank line.
+
+## [0.4.1] - 2026-05-26
+
+- Wrap long text in bulleted/ordered lists, paragraphs, headers, and blockquotes so it no longer overflows the terminal width. List items and headers use a hanging indent for continuation lines. (#1)
+
 ## [0.4.0] - 2026-05-18
 
 - Bind `Ctrl-D` / `Ctrl-U` for vim-style half-page scrolling in the curses pager.

data/lib/marvi/ast_walker.rb

@@ -16,7 +16,7 @@ module Marvi
       doc = Kramdown::Document.new(markdown, input: "GFM")
       lines = render_block(doc.root)
       lines.pop while lines.last&.plain_text&.empty?
-      lines
+      collapse_consecutive_blanks(lines)
     end
 
     private
@@ -29,7 +29,8 @@ module Marvi
         render_header(el)
       when :p
         src = el.options[:location]
-        [RichLine.new(render_inline_children(el), source_line: src), RichLine.blank]
+        wrapped = wrap_spans(render_inline_children(el), @max_width)
+        wrapped.each_with_index.map { |spans, i| RichLine.new(spans, source_line: (i.zero? ? src : nil)) } + [RichLine.blank]
       when :ul
         el.children.flat_map { |child| render_block(child, indent: indent, list_type: :ul) } + [RichLine.blank]
       when :ol
@@ -62,12 +63,15 @@ module Marvi
       content = render_inline_children(el).map do |s|
         Span.new(text: s.text, bold: true, italic: s.italic, color: s.color || color, bg_color: s.bg_color)
       end
-      [RichLine.new([prefix] + content, source_line: src), RichLine.blank]
+      wrap_with_prefix([prefix], content, @max_width, source_line: src) + [RichLine.blank]
     end
 
     def render_li(el, indent:, list_type:, list_index:)
       bullet = (list_type == :ol) ? "#{list_index}." : "•"
       prefix = Span.new(text: "#{"  " * indent}#{bullet} ", color: :cyan)
+      prefix_width = spans_display_width([prefix])
+      hanging = Span.new(text: " " * prefix_width)
+      inner_width = [@max_width - prefix_width, MIN_COL_WIDTH].max
       src = el.options[:location]
       lines = []
 
@@ -78,16 +82,25 @@ module Marvi
           nested.pop while nested.last&.plain_text&.empty?
           lines += nested
         when :p
+          content_spans = render_inline_children(child)
           if lines.empty?
-            lines << RichLine.new([prefix] + render_inline_children(child), source_line: src)
+            lines += wrap_with_prefix([prefix], content_spans, @max_width, source_line: src)
           else
-            lines += render_block(child)
+            child_src = child.options[:location]
+            wrapped = wrap_spans(content_spans, inner_width)
+            wrapped.each_with_index do |spans, i|
+              lines << RichLine.new([hanging] + spans, source_line: (i.zero? ? child_src : nil))
+            end
+            lines << RichLine.blank
           end
         else
-          lines << if lines.empty?
-            RichLine.new([prefix] + render_inline(child), source_line: src)
+          content_spans = render_inline(child)
+          if lines.empty?
+            lines += wrap_with_prefix([prefix], content_spans, @max_width, source_line: src)
           else
-            RichLine.new(render_inline(child))
+            wrap_spans(content_spans, inner_width).each do |spans|
+              lines << RichLine.new([hanging] + spans)
+            end
           end
         end
       end
@@ -110,12 +123,34 @@ module Marvi
     end
 
     def render_blockquote(el)
-      inner = el.children.flat_map { |child| render_block(child) }
       prefix = Span.new(text: "│ ", color: :cyan)
-      # preserve source_line from inner lines
+      prefix_width = spans_display_width([prefix])
+      # Reduce @max_width while rendering inner content so the │ prefix fits within @max_width
+      # without forcing a second wrap pass on already-wrapped lines.
+      saved_width = @max_width
+      @max_width = [saved_width - prefix_width, MIN_COL_WIDTH].max
+      inner = el.children.flat_map { |child| render_block(child) }
+      @max_width = saved_width
+      # Trim trailing blanks and collapse runs of blanks so the │ prefix doesn't produce
+      # dangling/duplicated "│ " lines (kramdown emits both :p trailing blanks and explicit
+      # :blank elements between siblings).
+      inner.pop while inner.last&.plain_text&.empty?
+      inner = collapse_consecutive_blanks(inner)
       inner.map { |line| RichLine.new([prefix] + line.spans, source_line: line.source_line) } + [RichLine.blank]
     end
 
+    def collapse_consecutive_blanks(lines)
+      out = []
+      prev_blank = false
+      lines.each do |line|
+        is_blank = line.plain_text.empty?
+        next if is_blank && prev_blank
+        out << line
+        prev_blank = is_blank
+      end
+      out
+    end
+
     def render_table(el)
       src = el.options[:location]
       rows = el.children.flat_map(&:children)
@@ -177,38 +212,58 @@ module Marvi
       shrunk
     end
 
+    def wrap_with_prefix(prefix_spans, content_spans, max_width, source_line: nil)
+      prefix_width = spans_display_width(prefix_spans)
+      inner_width = [max_width - prefix_width, MIN_COL_WIDTH].max
+      wrapped = wrap_spans(content_spans, inner_width)
+      indent = Span.new(text: " " * prefix_width)
+      wrapped.each_with_index.map do |spans, i|
+        line_prefix = i.zero? ? prefix_spans : [indent]
+        RichLine.new(line_prefix + spans, source_line: (i.zero? ? source_line : nil))
+      end
+    end
+
     def wrap_spans(spans, width)
       lines = [[]]
       current_width = 0
       spans.each do |span|
-        text = span.text.dup
-        until text.empty?
-          remaining = width - current_width
-          if remaining <= 0
+        # Split on \n so embedded hard line breaks become separate RichLines downstream,
+        # otherwise Curses.addstr resets the cursor to column 0 and bypasses padding/prefix.
+        parts = span.text.split("\n", -1)
+        parts.each_with_index do |part, idx|
+          if idx > 0 && !lines.last.empty?
             lines << []
             current_width = 0
-            remaining = width
-          end
-          taken = 0
-          chunk_width = 0
-          text.each_char do |c|
-            cw = Unicode::DisplayWidth.of(c)
-            break if chunk_width + cw > remaining
-            chunk_width += cw
-            taken += c.bytesize
           end
-          if taken.zero?
-            first_char = text.each_char.first
-            taken = first_char.bytesize
-            chunk_width = Unicode::DisplayWidth.of(first_char)
-          end
-          chunk = text.byteslice(0, taken)
-          text = text.byteslice(taken..) || ""
-          lines.last << Span.new(text: chunk, bold: span.bold, italic: span.italic, color: span.color, bg_color: span.bg_color)
-          current_width += chunk_width
-          unless text.empty?
-            lines << []
-            current_width = 0
+          text = part.dup
+          until text.empty?
+            remaining = width - current_width
+            if remaining <= 0
+              lines << []
+              current_width = 0
+              remaining = width
+            end
+            taken = 0
+            chunk_width = 0
+            text.each_char do |c|
+              cw = Unicode::DisplayWidth.of(c)
+              break if chunk_width + cw > remaining
+              chunk_width += cw
+              taken += c.bytesize
+            end
+            if taken.zero?
+              first_char = text.each_char.first
+              taken = first_char.bytesize
+              chunk_width = Unicode::DisplayWidth.of(first_char)
+            end
+            chunk = text.byteslice(0, taken)
+            text = text.byteslice(taken..) || ""
+            lines.last << Span.new(text: chunk, bold: span.bold, italic: span.italic, color: span.color, bg_color: span.bg_color)
+            current_width += chunk_width
+            unless text.empty?
+              lines << []
+              current_width = 0
+            end
           end
         end
       end

data/lib/marvi/renderer/curses.rb

@@ -23,6 +23,9 @@ module Marvi
       CTRL_D = 4
       CTRL_U = 21
 
+      MIN_HORIZONTAL_PADDING = 2
+      HORIZONTAL_PADDING_DIVISOR = 12
+
       def render(markdown, file: nil)
         @file = file
         @markdown = markdown
@@ -127,7 +130,17 @@ module Marvi
       end
 
       def rewalk
-        @lines = ASTWalker.new.walk(@markdown, max_width: ::Curses.cols)
+        @lines = ASTWalker.new.walk(@markdown, max_width: content_width)
+      end
+
+      def horizontal_padding
+        cols = ::Curses.cols
+        return 0 if cols <= MIN_HORIZONTAL_PADDING * 2
+        [MIN_HORIZONTAL_PADDING, cols / HORIZONTAL_PADDING_DIVISOR].max
+      end
+
+      def content_width
+        [::Curses.cols - horizontal_padding * 2, 1].max
       end
 
       def reload_from_key
@@ -214,8 +227,9 @@ module Marvi
 
       def draw
         ::Curses.clear
+        padding = horizontal_padding
         visible_lines.each_with_index do |line, row|
-          ::Curses.setpos(row, 0)
+          ::Curses.setpos(row, padding)
           render_line(line)
         end
         draw_status_bar

data/lib/marvi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marvi
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marvi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Mitsutaka Mimura