markdown_exec 3.4.0 → 3.5.0

data/docs/dev/block-type-ux-require.md

@@ -1,7 +1,3 @@
-/ This is an hidden shell block that is required by UX blocks.
-``` :(shell)
-ENTITY='Pongo tapanuliensis,Pongo'
-```
 ```ux +(shell)
 echo: "${ENTITY%%,*}"
 force: true
@@ -24,6 +20,14 @@ echo: "$NAME"
 force: true
 name: NAME2
 ```
+/
+/ This is a hidden shell block that is required by a UX block.
+/ All shell blocks required by a UX block are collected in a sequence
+/ that is the context for the evaluation of the expressions in the UX block.
+``` :(shell)
+ENTITY='Pongo tapanuliensis,Pongo'
+```
+/
 / This block is not visible. Execute to display the inherited lines for testing.
 ```opts :(menu_with_inherited_lines)
 menu_with_inherited_lines: true

data/docs/dev/import-directive-line-continuation.md

@@ -2,5 +2,4 @@
         __PS_STEM_SPECIES:q='Illacme tobini' \
         __PS_STEM_GENUS:q=Illacme \
         PS_STEM=U1
-Genus: ${__U1_GENUS}
 @import bats-document-configuration.md

data/docs/dev/import-directive-parameter-symbols.md

@@ -1,9 +1,7 @@
 / use MDE 3.3.0 import parameter symbols
 /
 @import ./import/parameter-symbols.md   __PS_STEM_SPECIES:q='Illacme tobini'   __PS_STEM_GENUS:q=Illacme   PS_STEM=U1
-Genus: ${__U1_GENUS}
 /
 @import ./import/parameter-symbols.md   __PS_STEM_SPECIES:q='Hydrodynastes bicinctus'   __PS_STEM_GENUS:q=Hydrodynastes   PS_STEM=U2
-Genus: ${__U2_GENUS}
 /
 @import ./bats-document-configuration.md

data/docs/dev/import-parameter-symbols-template.md

@@ -1,8 +1,10 @@
-**Command substitution:** `NAMEC`
-```bash
-echo "Command substitution: NAMEC"
-```
-
+/ 2025-11-13 the name of the variable generated
+/ changes on every load is not predictable
+/**Command substitution:** `NAMEC`
+/```bash
+/echo "Command substitution: NAMEC"
+/```
+/
 **Evaluated expression:** `NAMEE`
 ```bash
 echo "Evaluated expression: NAMEE"

data/docs/dev/import-parameter-symbols.md

@@ -2,5 +2,13 @@
 echo: Tapanuli Orangutan
 name: COMMON_NAME
 ```
-@import import-parameter-symbols-template.md   NAMEC:c='printf %s "$COMMON_NAME"'   NAMEE:e=$COMMON_NAME   NAMEL="Tapanuli Orangutan"   NAMEQ:q="Tapanuli Orangutan"   NAMEV:v=COMMON_NAME
-@import bats-document-configuration.md
+@import import-parameter-symbols-template.md \
+  NAMEC:cq='printf %s "$COMMON_NAME"' \
+  NAMEE:eq=$COMMON_NAME \
+  NAMEL="Tapanuli Orangutan" \
+  NAMEQ:qq="Tapanuli Orangutan" \
+  NAMEV:vq=COMMON_NAME
+@import bats-document-configuration.md
+```opts :(document_opts)
+dump_inherited_lines: false
+```

data/examples/colors.md

@@ -1,27 +1,19 @@
 # Demo configuring options
-
+/ v2025-09-30
 ::: These Opts blocks set the color for all elements.
-
-<https://en.wikipedia.org/wiki/Complementary_colors#/media/File:RGB_color_wheel.svg>
-
-/ ff0000 red - exception text
-/ ff7f00 orange - warning text
-/ ffff00 yellow - notification text
-/ 7fff00 chartreuse green - output frame
-/ 00ff00 green - prompt
-/ 00ff7f spring green - input frame
-/ 00ffff cyan - menu text
-/ 007fff azure - menu frame
-/ 0000ff blue
-/ 7f00ff violet - opts frame
-/ ff00ff magenta - opts text
-/ ff007f rose - exception frame
-
+/ blue    fg_rgbh_00_00_FF
+/ green   fg_rgbh_00_FF_00
+/ indigo  fg_rgbh_4B_00_82
+/ orange  fg_rgbh_FF_7F_00
+/ red     fg_rgbh_FF_00_00
+/ violet  fg_rgbh_94_00_D3
+/ yellow  fg_rgbh_FF_FF_00
 ```opts :load_colors
 exception_color_detail: fg_rgbh_1f_00_7f
 exception_color_name: fg_rgbh_1f_00_00
 execution_report_preview_frame_color: fg_rgbh_7f_1f_00
 menu_bash_color: fg_rgbh_00_c0_c0
+menu_block_color: fg_rgbh_47_ce_eb
 menu_chrome_color: fg_rgbh_40_c0_c0
 menu_divider_color: fg_rgbh_80_d0_c0
 menu_edit_color: fg_rgbh_e0_e0_20
@@ -44,11 +36,13 @@ script_preview_frame_color: fg_rgbh_7f_1f_00
 warning_color: fg_rgbh_1f_7f_00
 ```
 
+/ more green, less blue
 ```opts :load_colors2
 exception_color_detail: fg_rgbh_ff_00_7f
 exception_color_name: fg_rgbh_ff_00_00
 execution_report_preview_frame_color: fg_rgbh_7f_ff_00
 menu_bash_color: fg_rgbh_00_c0_c0
+menu_block_color: fg_rgbh_47_fe_bb
 menu_chrome_color: fg_rgbh_40_c0_c0
 menu_divider_color: fg_rgbh_80_d0_c0
 menu_edit_color: fg_rgbh_e2_e2_20
@@ -72,12 +66,18 @@ script_preview_frame_color: fg_rgbh_7f_ff_00
 warning_color: fg_rgbh_ff_7f_00
 ```
 
-::: Example blocks
+::: Divider color
+
+::: Fenced code blocks of different types
+Each block has a name. Its name is decorated according to the type of the block.
+``` :Unspecified1
 ```
+```unknown :Unknown1
 ```
 ```bash :Bash1
 ```
-```edit :Edit1
+/ Chrome decoration
+```edit :Edit-inherited-blocks
 ```
 ```history :History1
 ```
@@ -85,20 +85,22 @@ warning_color: fg_rgbh_ff_7f_00
 ```
 ```load :Load1
 ```
+/ Note decoration
+A Note
+/ Opts decoration
 ```opts :Opts1
 ```
 ```port :Port1
 ```
+/ Save decoration
 ```save :Save1
 ```
-```vars :Vars1
+/ Task decoration
+[ ] Task
+/ UX decoration
+```ux
+format: UX-1
 ```
-[ ] Task1
-
-/ blue;    fg_rgbh_00_00_FF
-/ green;   fg_rgbh_00_FF_00
-/ indigo;  fg_rgbh_4B_00_82
-/ orange;  fg_rgbh_FF_7F_00
-/ red;     fg_rgbh_FF_00_00
-/ violet;  fg_rgbh_94_00_D3
-/ yellow;  fg_rgbh_FF_FF_00
+/ Vars decoration
+```vars :Vars1
+```

data/lib/cached_nested_file_reader.rb

@@ -95,7 +95,6 @@ class CachedNestedFileReader
           'segment:', segment
 
       if continued_line || (Regexp.new(@import_directive_line_pattern) =~ segment)
-
         line = (continued_line || '') + segment
         # if segment ends in a continuation, prepend to next line
         if line.end_with?('\\')
@@ -104,13 +103,19 @@ class CachedNestedFileReader
         end
 
         continued_line = nil
-        Regexp.new(@import_directive_line_pattern) =~ line
+
+        # apply substitutions to the @import line
+        line_sub1 = apply_line_substitutions(line, substitutions,
+                                                    use_template_delimiters)
+
+        # parse the @import line
+        Regexp.new(@import_directive_line_pattern) =~ line_sub1
         name_strip = $~[:name].strip
         params_string = $~[:params] || ''
         import_indention = indention + $~[:indention]
-
         # Parse parameters for text substitution
         import_substitutions, add_code = parse_import_params(params_string)
+
         if add_code
           # strings as NestedLines
           add_lines = add_code.map.with_index do |line2, ind2|
@@ -187,6 +192,8 @@ class CachedNestedFileReader
   rescue Errno::ENOENT => err
     warn_format('readlines', "#{err} @@ #{context}",
                 { abort: true })
+  rescue StandardError
+    wwe $!
   end
 
   private
@@ -220,53 +227,14 @@ class CachedNestedFileReader
     scanned_params.each do |key, op, value|
       wwt :import, 'key:', key, 'op:', op, 'value:', value
 
-      # adjust key for current stem value
-      varname = key
-      case op
-      when @symbol_command_substitution,
-           @symbol_evaluated_expression,
-           @symbol_force_quoted_literal,
-           @symbol_variable_reference
-        # perform all substitutions per equal_op_params
-        equal_op_params.each do |equal_key, _equal_op, equal_value|
-          varname = varname.gsub(equal_key, equal_value)
-        end
-        wwt :import_key, 'varname:', varname
-      end
+      require_relative 'parameter_expansion'
+      expansion, new_var = ParameterExpansion.expand_parameter(key, op[1..-2], value)
+      value = expansion
 
-      case op
-      when @symbol_raw_literal
-        # skip replacement of equal values otherwise,
-        # the text is not available for other substitutions
-        next unless key != value
-
-        # replace the literal below
-      when @symbol_command_substitution
-        # add code to set the variable to the value of the parameter
-        add_code += shell_code_block_for_assignment(
-          varname, %($(#{value}))
-        )
-        # replace key with expansion of the added variable
-        value = "${#{varname}}"
-      when @symbol_evaluated_expression
-        # add code to set the variable to the value of the parameter
-        add_code += shell_code_block_for_assignment(
-          varname, %("#{value}")
-        )
-        # replace key with expansion of the added variable
-        value = "${#{varname}}"
-      when @symbol_force_quoted_literal
-        # add code to set the variable to the value of the parameter
+      unless new_var.nil?
         add_code += shell_code_block_for_assignment(
-          varname, Shellwords.escape(value)
+          new_var.name, Shellwords.escape(new_var.assignment_code)
         )
-        # replace key with expansion of the added variable
-        value = "${#{varname}}"
-      when @symbol_variable_reference
-        # variable exists
-        value = "${#{value}}"
-      else
-        wwe "Invalid op '#{op}'"
       end
 
       params[key] = value

data/lib/command_result.rb

@@ -33,11 +33,11 @@ class CommandResult
     exit_status.zero?
   end
 
-  # def new_lines
-  #   value = @attributes[:new_lines]
-  #   ww caller.deref[0..4], value
-  #   value
-  # end
+  def new_lines
+    value = @attributes[:new_lines] || []
+    ww caller.deref[0..4], value
+    value
+  end
 
   # # trap assignment to new_lines
   # def new_lines=(value)

data/lib/constants.rb

@@ -35,7 +35,9 @@ BLOCK_TYPE_COLOR_OPTIONS = {
     :readonly => :menu_ux_color_readonly,
     true => :menu_ux_color
   },
-  BlockType::VARS => :menu_vars_color
+  BlockType::VARS => :menu_vars_color,
+  # default for remaining block types
+  true => :menu_block_color
 }.freeze
 
 COLLAPSIBLE_SYMBOL_COLLAPSED = '⬢' # '<+>' # '∆'

data/lib/fcb.rb

@@ -55,6 +55,7 @@ module MarkdownExec
   class FCB
     def initialize(options = {})
       @attrs = {
+        block: nil,
         body: nil,
         call: nil,
         dname: nil,
@@ -74,6 +75,10 @@ module MarkdownExec
       }.merge(options)
     end
 
+    def append_block_line(line)
+      @attrs[:block].push line
+    end
+
     def pub_name(**kwargs)
       self.class.pub_name(@attrs, **kwargs)
     end
@@ -396,7 +401,7 @@ module MarkdownExec
 
     # calc the decoration sybol for the current block
     def option_to_decorate_ux_block
-      symbol_or_hash = BLOCK_TYPE_COLOR_OPTIONS[@attrs[:type]]
+      symbol_or_hash = BLOCK_TYPE_COLOR_OPTIONS[@attrs[:type]] || BLOCK_TYPE_COLOR_OPTIONS[true]
       if @attrs[:type] == BlockType::UX
         # only UX blocks accept a symbol or a hash
         if symbol_or_hash.is_a? Hash
@@ -526,6 +531,7 @@ if $PROGRAM_NAME == __FILE__
   class FCBTest < Minitest::Test
     def setup
       @fcb_data = {
+        block: nil,
         body: 'Sample body',
         call: 'Sample call',
         dname: 'Sample name',

data/lib/hash_delegator.rb

@@ -431,6 +431,7 @@ module HashDelegatorSelf
     return unless block && block_type_selected?(selected_types, :line)
 
     opts = {
+      block: nil,
       body: [line],
       id: source_id
     }
@@ -964,6 +965,7 @@ module MarkdownExec
                     # fcb.type = type
                   else
                     fcb = persist_fcb(
+                      block: nil,
                       body: fcb0.body,
                       center: fcb0.center,
                       chrome: true,
@@ -1316,13 +1318,13 @@ module MarkdownExec
     # for BlockType::UX
     def code_from_ux_block_to_set_environment_variables(
       selected, mdoc, inherited_code: nil, force: true, only_default: false,
-      silent:
+      required: nil, silent:
     )
       wwt :fcb, 'selected:', selected
       ret_command_result = nil
       exit_prompt = @delegate_object[:prompt_filespec_back]
 
-      required = mdoc.collect_recursively_required_code(
+      required ||= mdoc.collect_recursively_required_code(
         anyname: selected_id_name(selected),
         label_format_above: @delegate_object[:shell_code_label_format_above],
         label_format_below: @delegate_object[:shell_code_label_format_below],
@@ -1331,8 +1333,8 @@ module MarkdownExec
       wwt :required, required
 
       # process each ux block in sequence, setting ENV and collecting lines
-      required_lines = []
-      required[:blocks].each do |block|
+      concatenated_code_from_required_blocks = []
+      required[:blocks]&.each do |block|
         next unless block.type == BlockType::UX
 
         wwt :fcb, 'a required block', block
@@ -1360,9 +1362,9 @@ module MarkdownExec
 
           eval_code = join_array_of_arrays(
             inherited_code, # inherited code
-            required_lines, # current block requirements
+            concatenated_code_from_required_blocks, # current block requirements
             required_variables, # test conditions
-            required[:code] # current block code
+            required[:code] # required by selected
           )
           wwt :eval_code, 'eval_code:', eval_code
           if only_default
@@ -1386,24 +1388,24 @@ module MarkdownExec
           # update the required lines for this and subsequent blocks
           command_result_w_e_t_nl.new_lines =
             process_command_result_lines(command_result_w_e_t_nl, export,
-                                         required_lines)
-          required_lines.concat(command_result_w_e_t_nl.new_lines)
+                                         concatenated_code_from_required_blocks)
+          concatenated_code_from_required_blocks.concat(command_result_w_e_t_nl.new_lines)
 
-          required_lines = annotate_required_lines(
-            'blk:UX', required_lines, block_name: selected.id
+          concatenated_code_from_required_blocks = annotate_required_lines(
+            'blk:UX', concatenated_code_from_required_blocks, block_name: selected.id
           )
 
-          command_result_w_e_t_nl.new_lines = required_lines
+          command_result_w_e_t_nl.new_lines = concatenated_code_from_required_blocks
           ret_command_result = command_result_w_e_t_nl
         else
           raise "Invalid data type: #{data.inspect}"
         end
       end
-      wwt :required_lines, required_lines
+      wwt :concatenated_code_from_required_blocks, concatenated_code_from_required_blocks
 
       (ret_command_result || CommandResult.new(
         stdout: annotate_required_lines(
-          'blk:UX', required_lines, block_name: selected.id
+          'blk:UX', concatenated_code_from_required_blocks, block_name: selected.id
         )
       )).tap do |ret|
         wwt :cr, ret, caller.deref
@@ -1852,6 +1854,7 @@ module MarkdownExec
     def create_and_add_chrome_blocks(blocks, fcb, id: '', init_ids: false)
       index = nil
 
+      # find the first criteria with a pattern matching the body of the fcb
       unless (criteria = fcb.criteria)
         HashDelegator.chrome_block_criteria.each_with_index do |criteria1, index1|
           # rubocop:disable Lint/UselessAssignment
@@ -2450,7 +2453,7 @@ module MarkdownExec
       #
       if link_block_data.fetch(LinkKeys::EVAL, false) ||
          link_block_data.fetch(LinkKeys::EXEC, false)
-        code_lines += link_block_data_eval(
+        code_lines = link_block_data_eval(
           link_state, code_lines, selected, link_block_data,
           block_source: block_source,
           shell: @delegate_object[:block_type_default]
@@ -2622,18 +2625,36 @@ module MarkdownExec
           required[:blocks].map(&:body).flatten(1)
         )
       else
-        code_lines = if selected.type == BlockType::VARS
+        # code from the selected VARS block
+        vars_code = if selected.type == BlockType::VARS
                        code_from_vars_block_to_set_environment_variables(selected)
                      else
                        []
                      end
+
+        # activate UX blocks in the required list
+        command_result_w_e_t_nl = code_from_ux_block_to_set_environment_variables(
+          selected,
+          @dml_mdoc,
+          inherited_code: vars_code,
+          only_default: false,
+          required: required,
+          silent: false
+        )
+        ux_code = command_result_w_e_t_nl.failure? ? [] : command_result_w_e_t_nl.new_lines
+
         HashDelegator.flatten_and_compact_arrays(
           link_state&.inherited_lines,
           annotate_required_lines(
-            'blk:PORT', required[:code] + code_lines, block_name: selected.id
+            'blk:PORT',
+            required[:code] + vars_code + ux_code,
+            block_name: selected.id
           )
         )
       end
+
+    rescue StandardError
+      wwe(required[:code], ux_code, { error: $!, callback: $@[0] })
     end
 
     def execute_block_type_save(code_lines:, selected:)
@@ -3380,29 +3401,48 @@ module MarkdownExec
       output_lines = []
 
       Tempfile.open do |file|
-        cmd = "#{shell} #{file.path}"
         file.write(all_code.join("\n"))
         file.rewind
 
         if link_block_data.fetch(LinkKeys::EXEC, false)
+          # exec: true
+
           @run_state.files = StreamsOut.new
-          execute_command_with_streams([cmd]) do |_stdin, stdout, stderr, _thread|
+          execute_command_with_streams(
+            ["#{shell} #{file.path}"]
+          ) do |_stdin, stdout, stderr, _thread|
             line = stdout || stderr
             output_lines.push(line) if line
           end
 
-          ## select output_lines that look like assignment or match other specs
-          #
-          output_lines = process_string_array(
-            output_lines,
-            begin_pattern: @delegate_object.fetch(:output_assignment_begin,
-                                                  nil),
-            end_pattern: @delegate_object.fetch(:output_assignment_end, nil),
-            scan1: @delegate_object.fetch(:output_assignment_match, nil),
-            format1: @delegate_object.fetch(:output_assignment_format, nil),
-            name: ''
-          )
+          if link_block_data.fetch(LinkKeys::EVAL, true)
+            # eval: true
+
+            ## select output_lines that look like assignment or match other specs
+            #
+            output_lines = process_string_array(
+              output_lines,
+              begin_pattern: @delegate_object.fetch(:output_assignment_begin,
+                                                    nil),
+              end_pattern: @delegate_object.fetch(:output_assignment_end, nil),
+              scan1: @delegate_object.fetch(:output_assignment_match, nil),
+              format1: @delegate_object.fetch(:output_assignment_format, nil),
+              name: ''
+            )
 
+          else
+            # eval: false
+
+            ## select all output_lines
+            #
+            output_lines = process_string_array(
+              output_lines,
+              begin_pattern: @delegate_object.fetch(:output_assignment_begin,
+                                                    nil),
+              end_pattern: @delegate_object.fetch(:output_assignment_end, nil),
+              name: ''
+            )
+          end
         else
           output_lines = `bash #{file.path}`.split("\n")
         end
@@ -4891,6 +4931,7 @@ module MarkdownExec
                  end
 
       persist_fcb(
+        block: [line],
         body: [],
         call: rest.match(
           Regexp.new(@delegate_object[:block_calls_scan])
@@ -4942,6 +4983,8 @@ module MarkdownExec
           )
         )
       end
+    rescue StandardError
+      wwe $!, 'value:', value
     end
 
     ##
@@ -4985,6 +5028,7 @@ module MarkdownExec
         if state[:in_fenced_block]
           ## end of code block
           #
+          state[:fcb].append_block_line(line)
           HashDelegator.update_menu_attrib_yield_selected(
             fcb: state[:fcb],
             messages: selected_types,
@@ -5008,9 +5052,9 @@ module MarkdownExec
         ## add line to fenced code block
         # remove fcb indent if possible
         #
-        state[:fcb].body += [
-          line.chomp.sub(/^#{state[:fcb].indent}/, '')
-        ]
+        tline = line.chomp.sub(/^#{state[:fcb].indent}/, '')
+        state[:fcb].append_block_line(tline)
+        state[:fcb].body += [tline]
       elsif nested_line[:depth].zero? ||
             @delegate_object[:menu_include_imported_notes]
         # add line if it is depth 0 or option allows it

data/lib/link_history.rb

@@ -59,7 +59,7 @@ module MarkdownExec
 
     def inherited_lines=(value)
       @inherited_lines = value.tap do |ret|
-        pp ['LinkState.inherited_lines=() ->', ret] if $pd
+        pp ['LinkState.inherited_lines=() ->', ret, caller.deref(3).last] if $pd
       end
     end
 

data/lib/markdown_exec/version.rb

@@ -8,5 +8,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '3.4.0'
+  VERSION = '3.5.0'
 end

data/lib/menu.src.yml

@@ -575,13 +575,13 @@
 - :opt_name: import_directive_line_pattern
   :env_var: MDE_IMPORT_PATTERN
   :default: >-
-    ^(?<indention> *)@import +(?<name>\S+)(?<params>(?: +\w+(?::c=|:e=|:q=|:v=|=)(?:"[^"]*"|'[^']*'|\S+))*) *\\?$
+    ^(?<indention> *)@import +(?<name>\S+)(?<params>(?: +\w+(?::(?:[ceqv]|[ceqv]{2})=|=)(?:"[^"]*"|'[^']*'|\S+))*) *\\?$
   :procname: val_as_str
 
 - :opt_name: import_directive_parameter_scan
   :env_var: MDE_IMPORT_PATTERN_SCAN
   :default: >-
-    (\w+)(:c=|:e=|:q=|:v=|=)(?:"([^"]*)"|'([^']*)'|(\S+))
+    (\w+)(:[ceqv]{1,2}=|=)(?:"([^"]*)"|'([^']*)'|(\S+))
   :procname: val_as_str
 
 - :opt_name: import_parameter_variable_assignment
@@ -622,16 +622,20 @@
     :pattern: '\*\*_([^_]{0,64})_\*\*'
   - :color_method: :bold_italic
     :pattern: '\*\*~([^~]{0,64})~\*\*'
+  - :color_method: :bold_italic
+    :pattern: '\*\*\*([^*]{0,64})\*\*\*'       # common
   - :color_method: :bold
-    :pattern: '\*\*([^*]{0,64})\*\*'
+    :pattern: '\*\*([^*]{0,64})\*\*'           # common
+  - :color_method: :italic
+    :pattern: '`([^`]{0,64})`'                 # common
   - :color_method: :italic
-    :pattern: '`([^`]{0,64})`'
+    :pattern: '\*([^*]{0,64})\*'               # common
   - :color_method: :underline
     :pattern: __([^_]{0,64})__
   - :color_method: :underline_italic
     :pattern: _~([^_]{0,64})~_
   - :color_method: strikethrough
-    :pattern: '~~([^~]{0,64})~~'
+    :pattern: '~~([^~]{0,64})~~'               # common
 
 - :opt_name: line_decor_post
   :env_var: MDE_LINE_DECOR_POST
@@ -760,6 +764,12 @@
   :default: fg_rgbh_87_ce_eb  # Sky blue - matches echo color for informational bash blocks
   :procname: val_as_str
 
+- :opt_name: menu_block_color
+  :env_var: MDE_MENU_BLOCK_COLOR
+  :description: Default color for fenced code blocks
+  :default: fg_rgbh_60_a0_a0  # Teal - unrecognized fcb type, not active
+  :procname: val_as_str
+
 - :opt_name: menu_blocks_with_docname
   :env_var: MDE_MENU_BLOCKS_WITH_DOCNAME
   :description: Display document name in block selection menu
@@ -852,7 +862,7 @@
 - :opt_name: menu_heading1_color
   :env_var: MDE_MENU_HEADING1_COLOR
   :description: Color for heading 1 in menu
-  :default: fg_bg_rgbh_70_70_b0_f8_f8_fa  # Medium blue on light background for better readability
+  :default: fg_bg_rgbh_70_70_b0_07_07_04  # Medium blue
   :procname: val_as_str
 
 - :opt_name: menu_heading1_format
@@ -864,7 +874,7 @@
 - :opt_name: menu_heading2_color
   :env_var: MDE_MENU_HEADING2_COLOR
   :description: Color for heading 2 in menu
-  :default: fg_bg_rgbh_60_60_a0_f5_f5_f8  # Lighter blue on light background for hierarchy
+  :default: fg_bg_rgbh_60_60_a0_0a_0a_07  # Lighter blue
   :procname: val_as_str
 
 - :opt_name: menu_heading2_format
@@ -876,7 +886,7 @@
 - :opt_name: menu_heading3_color
   :env_var: MDE_MENU_HEADING3_COLOR
   :description: Color for heading 3 in menu
-  :default: fg_bg_rgbh_50_50_90_f2_f2_f5  # Lightest blue on light background for sub-hierarchy
+  :default: fg_bg_rgbh_50_50_90_0e_0e_0a  # Lightest blue
   :procname: val_as_str
 
 - :opt_name: menu_heading3_format