rdoc 6.3.4.1 → 8.0.0

data/lib/rdoc/markup/to_ansi.rb

@@ -7,7 +7,7 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
   ##
   # Creates a new ToAnsi visitor that is ready to output vibrant ANSI color!
 
-  def initialize markup = nil
+  def initialize
     super
 
     @headings.clear
@@ -19,16 +19,63 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
   ##
   # Maps attributes to ANSI sequences
 
-  def init_tags
-    add_tag :BOLD, "\e[1m", "\e[m"
-    add_tag :TT,   "\e[7m", "\e[m"
-    add_tag :EM,   "\e[4m", "\e[m"
+  ANSI_STYLE_CODES_ON = {
+    BOLD: 1,
+    TT: 7,
+    EM: 4,
+    STRIKE: 9
+  }
+
+  ANSI_STYLE_CODES_OFF = {
+    BOLD: 22,
+    TT: 27,
+    EM: 24,
+    STRIKE: 29
+  }
+
+  # Apply the given attributes by emitting ANSI sequences.
+  # Emitting attribute changes are deferred until new text is added and applied in batch.
+  # This method computes the necessary ANSI codes to transition from the
+  # current set of applied attributes to the new set of +attributes+.
+
+  def apply_attributes(attributes)
+    before = @applied_attributes
+    after = attributes.sort
+    return if before == after
+
+    if after.empty?
+      emit_inline("\e[m")
+    elsif !before.empty? && before.size > (before & after).size + 1
+      codes = after.map {|attr| ANSI_STYLE_CODES_ON[attr] }.compact
+      emit_inline("\e[#{[0, *codes].join(';')}m")
+    else
+      off_codes = (before - after).map {|attr| ANSI_STYLE_CODES_OFF[attr] }.compact
+      on_codes = (after - before).map {|attr| ANSI_STYLE_CODES_ON[attr] }.compact
+      emit_inline("\e[#{(off_codes + on_codes).join(';')}m")
+    end
+    @applied_attributes = attributes
+  end
+
+  def add_text(text)
+    attrs = @attributes.keys
+    if @applied_attributes != attrs
+      apply_attributes(attrs)
+    end
+    emit_inline(text)
+  end
+
+  def handle_inline(text)
+    @applied_attributes = []
+    res = super
+    res << "\e[m" unless @applied_attributes.empty?
+    @applied_attributes = []
+    res
   end
 
   ##
   # Overrides indent width to ensure output lines up correctly.
 
-  def accept_list_item_end list_item
+  def accept_list_item_end(list_item)
     width = case @list_type.last
             when :BULLET then
               2
@@ -52,7 +99,7 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
   ##
   # Adds coloring to note and label list items
 
-  def accept_list_item_start list_item
+  def accept_list_item_start(list_item)
     bullet = case @list_type.last
              when :BULLET then
                '*'
@@ -81,6 +128,10 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
     end
   end
 
+  def calculate_text_width(text)
+    text.gsub(/\e\[[\d;]*m/, '').size
+  end
+
   ##
   # Starts accepting with a reset screen
 
@@ -91,4 +142,3 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
   end
 
 end
-

data/lib/rdoc/markup/to_bs.rb

@@ -10,27 +10,42 @@ class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
   ##
   # Returns a new ToBs that is ready for hot backspace action!
 
-  def initialize markup = nil
+  def initialize
     super
 
     @in_b  = false
     @in_em = false
   end
 
-  ##
-  # Sets a flag that is picked up by #annotate to do the right thing in
-  # #convert_string
+  def handle_inline(text)
+    initial_style = []
+    initial_style << :BOLD if @in_b
+    initial_style << :EM   if @in_em
+    super(text, initial_style)
+  end
 
-  def init_tags
-    add_tag :BOLD, '+b', '-b'
-    add_tag :EM,   '+_', '-_'
-    add_tag :TT,   ''  , ''   # we need in_tt information maintained
+  def add_text(text)
+    attrs = @attributes.keys
+    if attrs.include? :BOLD
+      styled = +''
+      text.chars.each do |c|
+        styled << "#{c}\b#{c}"
+      end
+      text = styled
+    elsif attrs.include? :EM
+      styled = +''
+      text.chars.each do |c|
+        styled << "_\b#{c}"
+      end
+      text = styled
+    end
+    emit_inline(text)
   end
 
   ##
   # Makes heading text bold.
 
-  def accept_heading heading
+  def accept_heading(heading)
     use_prefix or @res << ' ' * @indent
     @res << @headings[heading.level][0]
     @in_b = true
@@ -41,37 +56,31 @@ class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
   end
 
   ##
-  # Turns on or off regexp handling for +convert_string+
-
-  def annotate tag
-    case tag
-    when '+b' then @in_b = true
-    when '-b' then @in_b = false
-    when '+_' then @in_em = true
-    when '-_' then @in_em = false
+  # Prepares the visitor for consuming +list_item+
+
+  def accept_list_item_start(list_item)
+    type = @list_type.last
+
+    case type
+    when :NOTE, :LABEL then
+      bullets = Array(list_item.label).map do |label|
+        attributes(label).strip
+      end.join "\n"
+
+      bullets << ":\n" unless bullets.empty?
+
+      @prefix = ' ' * @indent
+      @indent += 2
+      @prefix << bullets + (' ' * @indent)
+    else
+      bullet = type == :BULLET ? '*' :  @list_index.last.to_s + '.'
+      @prefix = (' ' * @indent) + bullet.ljust(bullet.length + 1)
+      width = bullet.length + 1
+      @indent += width
     end
-    ''
-  end
-
-  ##
-  # Calls convert_string on the result of convert_regexp_handling
-
-  def convert_regexp_handling target
-    convert_string super
   end
 
-  ##
-  # Adds bold or underline mixed with backspaces
-
-  def convert_string string
-    return string unless @in_b or @in_em
-    chars = if @in_b then
-              string.chars.map do |char| "#{char}\b#{char}" end
-            elsif @in_em then
-              string.chars.map do |char| "_\b#{char}" end
-            end
-
-    chars.join
+  def calculate_text_width(text)
+    text.gsub(/_\x08/, '').gsub(/\x08./, '').size
   end
-
 end