markdown_exec 2.7.3 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c35f2f729da73920db53053340bbe0ced75bfbb16ad59697fa6ba4016b62ae74
-  data.tar.gz: c20943723250feaa3e1b7218710cede9ebf4da4dd6eebf68584a805b9647b7d4
+  metadata.gz: e0463a06b2bac6770c2443819a9cedee15e7aa3404649f077924074fd3c639ab
+  data.tar.gz: 0f8b10556113950d468d92cfc11510178d7019d5b0e1c3f7ba0f61fdcab57414
 SHA512:
-  metadata.gz: 185f571fd39b4bdce955a455695413390b83c3635236871a83098bd595b184b5a79a2cd2b2778fb1fa795d658566237ed251e751fe1981a71aff192ce22da376
-  data.tar.gz: 19248dd05c973d9657362145826312fd2a07a7f6b4ad6834e623a19f289b35dc4d32c9c16401fc73a7e6309f4fc7ba9a5f63cc82a7db78299b623ea0d3b471f0
+  metadata.gz: 32d0e93870011249641e929ab4c6963905321301b508831ef5b56f7be925f69857e0bab3b4f030cfe39f6a8dff83376a099bd568616df872b8d4b7291c2f5227
+  data.tar.gz: aad2c863dd5bf6da344342e9336f6efa7045ec51d1471581b42bd26f42c1b1368d380b5f64781fb653154fd45f5f47db4d1fd7f22c8cc2f78c31a4781307b0dc

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.7.5] - 2025-02-02
+
+### Added
+
+- Option to control initial truncation of table cell text to fit screen width.
+- Truncate text to fit table cell fit to screen width. Click on first row of any table to toggle.
+
+### Changed
+
+- Fix the display of collapsible sections.
+- Fix the display of shell expansion and command substitution output.
+- Hide gem sources in caller.deref.
+
 ## [2.7.3] - 2025-01-29
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (2.7.3)
+    markdown_exec (2.7.5)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)

data/bats/options-collapse.bats

@@ -4,23 +4,23 @@ load 'test_helper'
 
 @test 'Options - Collapsible - Document options' {
   spec_mde_xansi_oname_doc_blocks_expect docs/dev/options-collapse.md \
-   'H1.1_L1.1_H2.1_H1.2_H2.2_H1.3_H2.3_L2.3_h3.3_L3.3_D4.3_L4.3'
+   'H1.1_L1.1_H2.1_H1.2_H1.3_L1.3_H2.3_L2.3_h3.3_L3.3_D4.3_L4.3'
 }
 
 @test 'Options - Collapsible Heading - Expand' {
   spec_mde_xansi_oname_doc_blocks_expect docs/dev/options-collapse.md \
    H2.1 \
-   'H1.1_L1.1_H2.1_L2.1_h3.1_L3.1_D4.1_L4.1_H1.2_L1.2_H2.2_H1.3_H2.3_L2.3_h3.3_L3.3_D4.3_L4.3'
+   'H1.1_L1.1_H2.1_L2.1_h3.1_L3.1_D4.1_L4.1_H1.2_H1.3_L1.3_H2.3_L2.3_h3.3_L3.3_D4.3_L4.3'
 }
 
 @test 'Options - Collapsible Divider' {
   spec_mde_xansi_oname_doc_blocks_expect docs/dev/options-collapse.md \
    D4.3 \
-   'H1.1_L1.1_H2.1_H1.2_H2.2_H1.3_H2.3_L2.3_h3.3_L3.3_D4.3'
+   'H1.1_L1.1_H2.1_H1.2_H1.3_L1.3_H2.3_L2.3_h3.3_L3.3_D4.3'
 }
 
 @test 'Options - Reveal' {
   spec_mde_xansi_oname_doc_blocks_expect docs/dev/options-collapse.md \
-   H2.2 h3.2 D4.2 \
-   'H1.1_L1.1_H2.1_H1.2_H2.2_L2.2_h3.2_L3.2_D4.2_L4.2_H1.3_L1.3_H2.3_L2.3_h3.3_L3.3_D4.3_L4.3'
+   H1.2 H2.2 h3.2 D4.2 \
+   'H1.1_L1.1_H2.1_H1.2_L1.2_H2.2_L2.2_h3.2_L3.2_D4.2_L4.2_H1.3_L1.3_H2.3_L2.3_h3.3_L3.3_D4.3_L4.3'
 }

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "2.7.3"
+  echo "2.7.5"
 }
 
 _mde() {

data/docs/dev/options-collapse.md

@@ -33,7 +33,7 @@ divider4_collapse: false
 divider4_collapsible: true
 heading1_center: false
 heading1_collapse: false
-heading1_collapsible: false
+heading1_collapsible: true
 heading2_center: false
 heading2_collapse: true
 heading2_collapsible: true

data/lib/collapser.rb

@@ -6,18 +6,20 @@
 require_relative 'constants'
 
 class Collapser
-  attr_accessor :options, :state
+  attr_accessor :compress_ids, :expand_ids, :options
 
   def initialize(
     collapsed_level: nil,
     collapsible_types: COLLAPSIBLE_TYPES,
-    options: {},
-    state: Hash.new(nil)
+    compress_ids:,
+    expand_ids:,
+    options: {}
   )
     @collapsed_level = collapsed_level
     @collapsible_types = collapsible_types.dup
     @options = options.dup
-    @state = state # do not dup
+    @compress_ids = compress_ids # by ref, user action
+    @expand_ids = expand_ids # by ref, user action
   end
 
   def collapse_per_options?(fcb, options: @options)
@@ -27,13 +29,15 @@ class Collapser
     criteria
   end
 
-  def collapse_per_state?(fcb, default: false, state: @state)
-    return false if state.nil?
-
-    criteria = state[fcb.id]
-    return default if criteria.nil?
-
-    !!criteria
+  # collapse per user action
+  def collapse_per_state?(fcb, default: false)
+    if @compress_ids.key?(fcb.id) && !!@compress_ids[fcb.id]
+      true
+    elsif @expand_ids.key?(fcb.id) && !!@expand_ids[fcb.id]
+      false
+    else
+      default
+    end
   end
 
   def collapse_per_token?(fcb)
@@ -52,10 +56,11 @@ class Collapser
   end
 
   def collapse?(fcb, initialize: false)
+    per_options_and_token = (collapse_per_options?(fcb) || collapse_per_token?(fcb)) && !expand_per_token?(fcb)
     if initialize
-      (collapse_per_options?(fcb) || collapse_per_token?(fcb)) && !expand_per_token?(fcb)
+      per_options_and_token
     else
-      collapse_per_state?(fcb, default: false)
+      collapse_per_state?(fcb, default: per_options_and_token)
     end
   end
 
@@ -100,8 +105,13 @@ class Collapser
     else
       fcb.hide = true
     end
-    @state[fcb.id] = fcb.level if fcb.collapse
-
+    if fcb.collapse
+      @compress_ids[fcb.id] = fcb.level
+      @expand_ids.delete(fcb.id)
+    else
+      @compress_ids.delete(fcb.id)
+      @expand_ids[fcb.id] = fcb.level
+    end
     collapsed_level
   end
 
@@ -138,13 +148,15 @@ OPTIONS = {
   heading3_collapse: false,
   heading3_collapsible: true
 }.freeze
-STATE = {}.freeze
 
 class CollapserTest < Minitest::Test
   def setup
-    @collapser = Collapser.new(collapsible_types: COLLAPSIBLE_TYPES.dup,
-                               options: OPTIONS.dup,
-                               state: STATE).dup
+    @collapser = Collapser.new(
+      collapsible_types: COLLAPSIBLE_TYPES.dup,
+      options: OPTIONS.dup,
+      compress_ids: {},
+      expand_ids: {}
+    ).dup
   end
 
   def test_analyze
@@ -312,7 +324,8 @@ class CollapserTest < Minitest::Test
         { name: 'collapsed remains collapsed',
           fcbs: [fc_h1a__collapse_collapsible],
           options: { heading1_collapsible: true },
-          state: { 'h1a' => 1 },
+          compress_ids: { 'h1a' => 1 },
+          expand_ids: {},
           initialize: false,
           expected: [fc_h1a__collapse_collapsible] }
       ]
@@ -324,7 +337,8 @@ class CollapserTest < Minitest::Test
           collapsed_level: test_case[:collapsed_level],
           collapsible_types: test_case[:collapsible_types] || COLLAPSIBLE_TYPES,
           options: (test_case[:options] || OPTIONS).dup,
-          state: (test_case[:state] || STATE).dup
+          compress_ids: test_case[:compress_ids] || {},
+          expand_ids: {}
         )
         analysis = @collapser.analyze(
           test_case[:fcbs],

data/lib/fcb.rb

@@ -33,6 +33,10 @@ module MarkdownExec
         title: '',
         type: ''
       }.merge(options)
+      # @attrs[:raw_body] ||= @attrs[:body]
+      # @attrs[:raw_dname] ||= @attrs[:dname]
+      # @attrs[:raw_s0printable] ||= @attrs[:s0printable]
+      # @attrs[:raw_s1decorated] ||= @attrs[:s1decorated]
     end
 
     def code_name_included?(*names)
@@ -43,6 +47,10 @@ module MarkdownExec
       Regexp.new(regexp) =~ @attrs[:oname]
     end
 
+    def delete_key(key)
+      @attrs.delete(key)
+    end
+
     # Derives a title from the body of an FCB object.
     # @param fcb [Object] The FCB object whose title is to be derived.
     # @return [String] The derived title.
@@ -57,10 +65,38 @@ module MarkdownExec
       @attrs[:title] = if body_content.count == 1
                          body_content.first
                        else
-                         FCB::format_multiline_body_as_title(body_content)
+                         FCB.format_multiline_body_as_title(body_content)
                        end
     end
 
+    # def body=(value)
+    #   ww0 'body=', value
+    #   # binding.irb
+    #   @attrs[:raw_body] ||= value
+    #   @attrs[:body] = value
+    # end
+
+    # def dname=(value)
+    #   ww0 'dname=', value
+    #   binding.irb if value == '                                              | Species| Not specified'
+    #   @attrs[:raw_dname] ||= value
+    #   @attrs[:dname] = value
+    # end
+
+    # def s0printable=(value)
+    #   ww0 's0printable=', value
+    #   # binding.irb
+    #   @attrs[:raw_s0printable] ||= value
+    #   @attrs[:s0printable] = value
+    # end
+
+    # def s1decorated=(value)
+    #   ww0 's1decorated=', value
+    #   # binding.irb
+    #   @attrs[:raw_s1decorated] ||= value
+    #   @attrs[:s1decorated] = value
+    # end
+
     # Processes a block to generate its summary, modifying its attributes
     #  based on various matching criteria.
     # It handles special formatting for bash blocks, extracting and setting
@@ -75,6 +111,7 @@ module MarkdownExec
       block_name_nick_match: @delegate_object[:block_name_nick_match],
       id: ''
     )
+      # binding.irb
       call = @attrs[:call] = @attrs[:start_line]&.match(
         Regexp.new(block_calls_scan)
       )&.fetch(1, nil)
@@ -85,7 +122,7 @@ module MarkdownExec
                 @attrs[:nickname] = $~[0]
                 derive_title_from_body
               else
-                bm = NamedCaptureExtractor::extract_named_groups(
+                bm = NamedCaptureExtractor.extract_named_groups(
                   titlexcall,
                   block_name_match
                 )
@@ -161,7 +198,6 @@ module MarkdownExec
     end
 
     # Expand variables in attributes
-    ####
     def expand_variables_in_attributes!(pattern, replacements)
       @attrs[:raw_dname] ||= @attrs[:dname]
       @attrs[:dname] = @attrs[:dname]&.gsub(pattern) do |match|
@@ -179,14 +215,14 @@ module MarkdownExec
       end
 
       # Replace variables in each line of `body` if `body` is present
-      if @attrs[:body]
-        @attrs[:raw_body] ||= @attrs[:body]
-        @attrs[:body] = @attrs[:body]&.map do |line|
-          if line.empty?
-            line
-          else
-            line.gsub(pattern) { |match| replacements[match] }
-          end
+      return unless @attrs[:body]
+
+      @attrs[:raw_body] ||= @attrs[:body]
+      @attrs[:body] = @attrs[:body]&.map do |line|
+        if line.empty?
+          line
+        else
+          line.gsub(pattern) { |match| replacements[match] }
         end
       end
     end

data/lib/format_table.rb

@@ -63,20 +63,31 @@ module MarkdownTableFormatter
     end
   end
 
-  def format_cell(cell, align, width)
-    case align
-    when :center
-      cell.center(width)
-    when :right
-      cell.rjust(width)
-    else
-      cell.ljust(width)
-    end
+  def format_cell(cell, align, width, truncate: true)
+    plain_string = cell.gsub(/\033\[[\d;]+m|\033\[0m/, '')
+    truncated = false
+    ret = TrackedString.new(
+      case
+      when truncate && plain_string.length > width
+        truncated = true
+        plain_string[0, width]
+      when align == :center
+        cell.center(width)
+      when align == :right
+        cell.rjust(width)
+      else
+        cell.ljust(width)
+      end
+    )
+    ret.truncated = truncated
+    ret
   end
 
   def format_row_line__hs(
     row, alignment_indicators, column_widths, decorate,
-    text_sym: :text, style_sym: :color
+    style_sym: :color,
+    text_sym: :text,
+    truncate: true
   )
     return HierarchyString.new if row.cells.nil?
 
@@ -92,8 +103,10 @@ module MarkdownTableFormatter
                style_sym => decorate && decorate[row.role] }
            else
              {
-               text_sym => format_cell(cell, alignment_indicators[i],
-                                       column_widths[i]),
+               text_sym => format_cell(
+                 cell, alignment_indicators[i], column_widths[i],
+                 truncate: truncate
+               ),
                style_sym => decoration_style(row.role, row.counter, decorate)
              }
            end
@@ -106,9 +119,15 @@ module MarkdownTableFormatter
     )
   end
 
-  def format_rows__hs(rows, alignment_indicators, column_widths, decorate)
+  def format_rows__hs(
+    rows, alignment_indicators, column_widths, decorate,
+    truncate: true
+  )
     rows.map do |row|
-      format_row_line__hs(row, alignment_indicators, column_widths, decorate)
+      format_row_line__hs(
+        row, alignment_indicators, column_widths, decorate,
+        truncate: truncate
+      )
     end
   end
 
@@ -116,7 +135,11 @@ module MarkdownTableFormatter
     format_table__hs(**kwargs).map(&:decorate)
   end
 
-  def format_table__hs(lines:, column_count:, decorate: nil)
+  def format_table__hs(
+    lines:, column_count:, decorate: nil,
+    table_width: nil,
+    truncate: true
+  )
     unless column_count.positive?
       return lines.map do |line|
         HierarchyString.new([{ text: line }])
@@ -129,7 +152,23 @@ module MarkdownTableFormatter
     alignment_indicators, column_widths =
       calculate_column_alignment_and_widths(rows, column_count)
 
-    format_rows__hs(rows, alignment_indicators, column_widths, decorate)
+    # ww0 'table_width', table_width
+    # ww0 'truncate', truncate
+
+    unless table_width.nil?
+      sum_column_widths = column_widths.sum
+      if sum_column_widths > table_width
+        ratio = table_width.to_f / sum_column_widths
+        column_widths.each_with_index do |width, i|
+          column_widths[i] = (width * ratio).to_i
+        end
+      end
+    end
+
+    format_rows__hs(
+      rows, alignment_indicators, column_widths, decorate,
+      truncate: truncate
+    ).tap { |ret| binding.irb if ret.class == TrackedString }
   end
 
   def insert_every_other(array, obj)

data/lib/hash_delegator.rb

@@ -43,6 +43,7 @@ require_relative 'table_extractor'
 require_relative 'text_analyzer'
 
 $pd = false unless defined?($pd)
+$table_cell_truncate = true
 
 class String
   # Checks if the string is not empty.
@@ -291,9 +292,25 @@ module HashDelegatorSelf
           row: delegate_object[:table_row_color],
           separator_line: delegate_object[:table_separator_line_color]
         },
-        lines: lines
+        lines: lines,
+        table_width: screen_width_for_table,
+        truncate: $table_cell_truncate
       )
 
+      truncated_table_cell = false
+      table__hs.each do |table_hs|
+        table_hs.substrings.each do |substrings|
+          substrings.each do |node|
+            if node[:text].class == TrackedString
+              truncated_table_cell = node[:text].truncated
+              break if truncated_table_cell
+            end
+          end
+          break if truncated_table_cell
+        end
+        break if truncated_table_cell
+      end
+
       unless table__hs.count == range.size
         raise 'Invalid result from MarkdownTableFormatter.format_table()'
       end
@@ -317,6 +334,13 @@ module HashDelegatorSelf
         end
         fcb.s3indent ||= ''
         fcb.dname = fcb.indented_decorated = fcb.s3indent + fcb.s3formatted_table_row.decorate
+
+        if ind.zero?
+          fcb.truncated_table_cell = truncated_table_cell
+          # if truncated_table_cell
+          fcb.delete_key(:disabled)
+          # end
+        end
       end
     end
   end
@@ -581,7 +605,8 @@ module MarkdownExec
       @p_params = {}
       @p_rest = []
 
-      @compressed_ids = nil
+      @compressed_ids = {}
+      @expanded_ids = {}
     end
 
     ##
@@ -902,8 +927,10 @@ module MarkdownExec
 
     # private
 
-    def build_replacement_dictionary(commands, link_state,
-                                     initial_code_required: false, key_format:)
+    def build_replacement_dictionary(
+      commands, link_state,
+      initial_code_required: false, key_format:
+    )
       evaluate_shell_expressions(
         (link_state&.inherited_lines_block || ''), commands,
         initial_code_required: initial_code_required,
@@ -983,7 +1010,7 @@ module MarkdownExec
 
     # sets ENV
     def code_from_vars_block_to_set_environment_variables(selected)
-      code_lines = []      
+      code_lines = []
       case data = YAML.load(selected.body.join("\n"))
       when Hash
         data.each do |key, value|
@@ -1232,14 +1259,21 @@ module MarkdownExec
     #  to the block's display name.
     # return number of lines added
     def create_and_add_chrome_block(
-      blocks:, case_conversion: nil, center: nil,
-      collapse: nil, color_method:, decor_patterns: [],
-      disabled: true, format_option:, id: '',
-      level: 0, match_data:, type: '',
-      wrap: nil,
-      fcb: nil
+      blocks:,
+      case_conversion: nil,
+      center: nil,
+      collapse: nil,
+      color_method:,
+      decor_patterns: [],
+      disabled: true,
+      fcb: nil,
+      format_option:,
+      id: '',
+      level: 0,
+      match_data:,
+      type: '',
+      wrap: nil
     )
-      ww 'match_data', match_data
       line_cap = NamedCaptureExtractor.extract_named_group_match_data(match_data)
       # replace tabs in indent
       line_cap[:indent] ||= ''
@@ -1296,7 +1330,24 @@ module MarkdownExec
 
         line_obj[:line] = line_obj[:indent] + line_obj[:text]
 
-        if !use_fcb
+        if use_fcb
+          fcb.center = center
+          fcb.chrome = true
+          fcb.collapse = collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse
+          fcb.token = line_obj[:collapse]
+          fcb.disabled = disabled ? TtyMenu::DISABLE : nil
+          fcb.id = "#{id}.#{index}"
+          fcb.level = level
+          fcb.s0indent = indent
+          fcb.s0printable = line_obj[:text]
+          fcb.s1decorated = decorated
+          fcb.dname = line_obj[:indent] + decorated
+          fcb.indent = line_obj[:indent]
+          fcb.oname = line_obj[:text]
+          fcb.text = line_obj[:text]
+          fcb.type = type
+          use_fcb = false # next line is new record
+        else
           fcb = FCB.new(
             center: center,
             chrome: true,
@@ -1314,23 +1365,6 @@ module MarkdownExec
             text: line_obj[:text],
             type: type
           )
-        else
-          fcb.center = center
-          fcb.chrome = true
-          fcb.collapse = collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse
-          fcb.token = line_obj[:collapse]
-          fcb.disabled = disabled ? TtyMenu::DISABLE : nil
-          fcb.id = "#{id}.#{index}"
-          fcb.level = level
-          fcb.s0indent = indent
-          fcb.s0printable = line_obj[:text]
-          fcb.s1decorated = decorated
-          fcb.dname = line_obj[:indent] + decorated
-          fcb.indent = line_obj[:indent]
-          fcb.oname = line_obj[:text]
-          fcb.text = line_obj[:text]
-          fcb.type = type
-          use_fcb = false # next line is new record
         end
 
         blocks.push fcb
@@ -1378,7 +1412,7 @@ module MarkdownExec
                         @delegate_object[criteria[:color]].to_sym,
           decor_patterns:
             @decor_patterns_from_delegate_object_for_block_create,
-          disabled: !(criteria[:collapsible] && @delegate_object[criteria[:collapsible]]),
+          disabled: fcb.truncated_table_cell.nil? && !(criteria[:collapsible] && @delegate_object[criteria[:collapsible]]),
           fcb: fcb,
           id: "#{id}.#{index}",
           format_option: criteria[:format] &&
@@ -1669,7 +1703,13 @@ module MarkdownExec
       selected:, mdoc:, block_source:, link_state: LinkState.new
     )
       # order should not be important other than else clause
-      if selected.type == BlockType::EDIT
+      if selected.type == BlockType::TEXT && !selected.truncated_table_cell.nil?
+        debounce_reset
+        $table_cell_truncate = !$table_cell_truncate
+
+        LoadFileLinkState.new(LoadFile::REUSE, link_state)
+
+      elsif selected.type == BlockType::EDIT
         debounce_reset
         vux_edit_inherited
         return :break if pause_user_exit
@@ -1814,7 +1854,7 @@ module MarkdownExec
       filename: '*',
       form: '%{line}',
       link_state:,
-      regexp: "^(?<line>.*)$",
+      regexp: '^(?<line>.*)$',
       selected:
     )
       block_data = HashDelegator.parse_yaml_data_from_body(selected.body)
@@ -2207,7 +2247,8 @@ module MarkdownExec
     def execute_required_lines(
       blockname: '',
       erls: {},
-      required_lines: [], shell:
+      required_lines: [],
+      shell:
     )
       if @delegate_object[:save_executed_script]
         write_command_file(blockname: blockname,
@@ -2242,12 +2283,12 @@ module MarkdownExec
     end
 
     def expand_variable_references!(
-      echo_format: 'echo $%s',
-      link_state:,
       blocks:,
+      echo_format: 'echo $%s',
       group_name: :variable,
       initial_code_required: false,
       key_format: '${%s}',
+      link_state:,
       pattern: nil
     )
       pattern ||= options_variable_expression_regexp
@@ -2563,11 +2604,14 @@ module MarkdownExec
       label_format_below = @delegate_object[:shell_code_label_format_below]
 
       ([
-        label_format_above.present? ?
+        if label_format_above.present?
           format(
             label_format_above,
             block_source.merge({ block_name: selected.pub_name })
-          ) : nil
+          )
+        else
+          nil
+        end
       ] +
       output_lines.map do |line|
         re = Regexp.new(link_block_data.fetch('pattern', '(?<line>.*)'))
@@ -2579,11 +2623,14 @@ module MarkdownExec
         )
       end +
       [
-        label_format_below.present? ?
+        if label_format_below.present?
           format(
             label_format_below,
             block_source.merge({ block_name: selected.pub_name })
-          ) : nil
+          )
+        else
+          nil
+        end
       ]).compact
     end
 
@@ -2809,9 +2856,11 @@ module MarkdownExec
     def mdoc_menu_and_blocks_from_nested_files(link_state, source_id: '')
       # read blocks, load document opts block, and re-process blocks
       #
+      reload_blocks = false
+
       all_blocks, mdoc = mdoc_and_blocks_from_nested_files(source_id: source_id)
       if load_auto_opts_block(all_blocks, mdoc: mdoc)
-        all_blocks, mdoc = mdoc_and_blocks_from_nested_files(source_id: source_id)
+        reload_blocks = true
       end
 
       # load document shell block
@@ -2819,6 +2868,7 @@ module MarkdownExec
       if code_lines = load_document_shell_block(all_blocks, mdoc: mdoc)
         next_state_set_code(nil, link_state, code_lines)
         link_state.inherited_lines = code_lines
+        reload_blocks = true
       end
 
       # load document vars block
@@ -2828,15 +2878,31 @@ module MarkdownExec
                                             code_lines)
         next_state_set_code(nil, link_state, new_code)
         link_state.inherited_lines = new_code
+        reload_blocks = true
+      end
+
+      if reload_blocks
+        all_blocks, mdoc = mdoc_and_blocks_from_nested_files(source_id: source_id)
       end
 
       # filter by name, collapsed
       #
-      menu_blocks, @compressed_ids = mdoc.fcbs_per_options(
-        @delegate_object.merge!(compressed_ids: @compressed_ids)
+      menu_blocks = mdoc.fcbs_per_options(
+        @delegate_object.merge!(compressed_ids: @compressed_ids,
+                                expanded_ids: @expanded_ids)
       )
 
+      # restore pre-expansion (raw) values
+      #
+      menu_blocks.each do |fcb|
+        fcb.dname = fcb.raw_dname unless fcb.raw_dname.nil?
+        fcb.s0printable = fcb.raw_s0printable unless fcb.raw_s0printable.nil?
+        fcb.s1decorated = fcb.raw_s1decorated unless fcb.raw_s1decorated.nil?
+        fcb.body = fcb.raw_body unless fcb.raw_body.nil?
+      end
+
       # re-expand blocks
+      #
       menu_blocks.each do |fcb|
         fcb.body = fcb.raw_body || fcb.body || []
         fcb.dname = fcb.raw_dname || fcb.dname
@@ -2858,6 +2924,7 @@ module MarkdownExec
       HashDelegator.tables_into_columns!(menu_blocks, @delegate_object,
                                          screen_width_for_table)
 
+
       [all_blocks, menu_blocks, mdoc]
     end
 
@@ -2918,19 +2985,16 @@ module MarkdownExec
       end
     end
 
-    def menu_compress_collapsible_block(selected)
-      @compressed_ids.merge!(selected.id => selected.level)
-    end
-
-    def menu_expand_collapsible_block(selected)
-      @compressed_ids.delete(selected.id)
-    end
-
     def menu_toggle_collapsible_block(selected)
-      if @compressed_ids.keys.include?(selected.id)
-        menu_expand_collapsible_block(selected)
-      else
-        menu_compress_collapsible_block(selected)
+      # return true if @compress_ids.key?(fcb.id) && !!@compress_ids[fcb.id]
+      # return false if @expand_ids.key?(fcb.id) && !!@expand_ids[fcb.id]
+      # binding.irb
+      if @compressed_ids.key?(selected.id) && !!@compressed_ids[selected.id]
+        @compressed_ids.delete(selected.id)
+        @expanded_ids[selected.id] = selected.level
+      else # @expand_ids.key?(fcb.id) && !!@expand_ids[fcb.id]
+        @compressed_ids[selected.id] = selected.level
+        @expanded_ids.delete(selected.id)
       end
     end
 
@@ -3403,7 +3467,6 @@ module MarkdownExec
     def saved_asset_for_history(
       file:, form:, match_info:
     )
-
       OpenStruct.new(
         file: file[(Dir.pwd.length + 1)..-1],
         full: file,
@@ -4495,9 +4558,9 @@ module MarkdownExec
                         when nil
                           nil
                         when String
-                          menu_blocks.find { |block|
+                          menu_blocks.find do |block|
                             block.dname.include?(prior_answer)
-                          }&.name
+                          end&.name
                         when Struct
                           prior_answer.index || prior_answer.name
                         end

data/lib/hierarchy_string.rb

@@ -2,6 +2,15 @@
 
 require_relative 'ansi_string'
 
+class TrackedString < String
+  attr_accessor :truncated
+
+  def initialize(str)
+    super(str)
+    @truncated = false
+  end
+end
+
 # Class representing a hierarchy of substrings stored as Hash nodes
 # HierarchyString is a class that represents and manipulates strings based on a hierarchical structure.
 # The input to the class can be a single hash or an array of nested hashes, where each hash contains a

data/lib/markdown_exec/version.rb

@@ -7,5 +7,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '2.7.3'
+  VERSION = '2.7.5'
 end

data/lib/markdown_exec.rb

@@ -282,6 +282,7 @@ module MarkdownExec
     include StringUtil
 
     def initialize(options = {})
+      # ww0 'options', options, caller.deref
       @option_parser = nil
 
       @options = HashDelegator.new(options)

data/lib/mdoc.rb

@@ -220,101 +220,31 @@ module MarkdownExec
       end
 
       collapser = Collapser.new(
-        options: opts, state: opts[:compressed_ids] || {}
+        options: opts,
+        compress_ids: opts[:compressed_ids] || {},
+        expand_ids: opts[:expanded_ids] || {}
       )
-      selrows = collapser.reject(selrows, initialize: opts[:compressed_ids].nil?) do |fcb, hide, collapsed_level|
+      selrows = collapser.reject(
+        selrows,
+        initialize: opts[:compressed_ids].nil?
+      ) do |fcb, _hide, _collapsed_level|
         # update fcb per state
         if fcb.collapsible
           fcb.s1decorated = fcb.s1decorated + ' ' + (fcb.collapse ? opts[:menu_collapsible_symbol_collapsed] : opts[:menu_collapsible_symbol_expanded])
         end
       end
-      opts[:compressed_ids] = collapser.state
+      opts[:compressed_ids] = collapser.compress_ids
+      opts[:expanded_ids] = collapser.expand_ids
 
       # remove
       # . empty chrome between code; edges are same as blanks
       #
-      [
-        select_elements_with_neighbor_conditions(selrows) do |prev_element, current, next_element|
-          !(current[:chrome] && !current.oname.present?) ||
-            !(!prev_element.nil? &&
-              prev_element.shell.present? &&
-              !next_element.nil? &&
-              next_element.shell.present?)
-        end,
-        opts[:compressed_ids]
-      ]
-    end
-
-    # Filters out blocks that are nested within a hierarchy of "hidden" blocks.
-    #
-    # The method iterates over selected rows and uses a callback block to determine if a given block
-    # should trigger hiding for subsequent blocks in the hierarchy. Once hiding is triggered, all
-    # blocks with a level greater than the triggering block's level are excluded until the next
-    # visible collapsible block.
-    #
-    # @param selrows [Array] The array of selected rows to filter based on the callback's results.
-    # @param callback [Lambda/Proc] Alternate to yield block.
-    # @param collapsible_types [Array] Types to select, nil for all.
-    # @yield [block] A callback to evaluate each block; should return true to initiate hiding.
-    # @return [Array] Filtered list of rows, excluding those hidden by hierarchical hiding rules.
-    #
-    # Example:
-    #   proc_condition = Proc.new { |fcb| fcb.type == BlockType::HEADING && fcb.level == 1 }
-    #   reject_collapsed_blocks(selrows, callback: proc_condition)
-    #
-    #   lambda_condition = ->(fcb) { fcb.type == BlockType::HEADING && fcb.level == 1 }
-    #   reject_collapsed_blocks(selrows, callback: lambda_condition)
-    #
-    # Block: Exits the enclosing method (test_with_block) if return is used.
-    #        Flexible with arguments
-    # Proc: Exits the enclosing method (test_with_proc) when return is encountered, similar to a block.
-    # Lambda: Only exits the lambda itself, allowing reject_collapsed_blocks to continue execution.
-    #         Stricter argument checking.
-    #
-    # **`lambda` provides more control** and avoids the early exit behavior caused by `return` in blocks or `Proc` objects, making it a safer choice when you want `reject_collapsed_blocks` to complete its execution regardless of the callback’s behavior.
-    def reject_collapsed_blocks(
-      selrows,
-      callback: nil,
-      reject_callback: nil,
-      collapsible_types: nil,
-      &block
-    )
-      block ||= callback           # Use callback if no block is provided
-      hiding = false               # State to indicate if hiding is active
-      hidden_level = nil           # Level at which hiding was triggered
-
-      selrows.reject do |fcb|      # Reject rows that should be hidden based on the hierarchy
-        if hiding
-          # Currently in hiding mode; evaluate if the current block should remain hidden
-          if collapsible_types.nil? || collapsible_types.include?(fcb.type)
-            if hidden_level.nil?
-              # No specific hidden level yet, allow the item to show
-              false
-            elsif fcb.level > hidden_level
-              reject_callback.call(fcb, ) if reject_callback
-              # The current block is at a deeper level and thus remains hidden
-              true
-            else
-              # At the same or higher level than hidden_level, check if the callback initiates hiding again
-              hiding = block.call(fcb)
-              hidden_level = fcb.level if hiding # Update hidden level if hiding continues
-              false                              # Do not hide the initiating block itself
-            end
-          else
-            reject_callback.call(fcb) if reject_callback
-            # Non-collapsible block types (e.g., text or note) continue hiding by default
-            true
-          end
-
-        elsif block.call(fcb)
-          # If callback triggers hiding, initialize hiding state and hidden_level
-          hiding = fcb.type        # Start hiding subsequent blocks
-          hidden_level = fcb.level # Define the hierarchical level for hiding
-          false                    # Do not hide the initiating block itself
-
-        else
-          false                    # Default: do not hide if no hiding state
-        end
+      select_elements_with_neighbor_conditions(selrows) do |prev_element, current, next_element|
+        !(current[:chrome] && !current.oname.present?) ||
+          !(!prev_element.nil? &&
+            prev_element.shell.present? &&
+            !next_element.nil? &&
+            next_element.shell.present?)
       end
     end
 
@@ -605,7 +535,7 @@ if $PROGRAM_NAME == __FILE__
 
       def test_fcbs_per_options
         opts = { hide_blocks_by_name: true, block_name_hidden_match: 'block1' }
-        result, _ = @doc.fcbs_per_options(opts)
+        result = @doc.fcbs_per_options(opts)
         assert_equal [@table[1], @table[2]], result
       end if false ### broken test
 

data/lib/menu.src.yml

@@ -1587,6 +1587,12 @@
   :description: Color for table border
   :default: fg_bg_rgbh_00_00_df_14_18_1c
 
+- :opt_name: table_cell_text_truncate
+  :env_var: MDE_TABLE_CELL_TEXT_TRUNCATE
+  :arg_name: BOOL
+  :default: true
+  :procname: val_as_bool
+
 - :opt_name: table_center
   :env_var: MDE_TABLE_CENTER
   :arg_name: BOOL

data/lib/menu.yml

@@ -1355,6 +1355,11 @@
   :env_var: MDE_TABLE_BORDER_COLOR
   :description: Color for table border
   :default: fg_bg_rgbh_00_00_df_14_18_1c
+- :opt_name: table_cell_text_truncate
+  :env_var: MDE_TABLE_CELL_TEXT_TRUNCATE
+  :arg_name: BOOL
+  :default: true
+  :procname: val_as_bool
 - :opt_name: table_center
   :env_var: MDE_TABLE_CENTER
   :arg_name: BOOL

data/lib/ww.rb

@@ -83,7 +83,7 @@ class Array
   unless defined?(deref)
     def deref
       map(&:deref).select do |line|
-        !%r{^/vendor/}.match(line)
+        !%r{^/(vendor|\.bundle)/}.match(line)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.5
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard