Bug fixes mostlry, tested and seems to be working better.

src/fenrirscreenreader/commands/command_template.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/00_init_commands.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 # this command is just to initialize stuff.
 # like init index lists in memoryManager

src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 import string
 initialized = False

src/fenrirscreenreader/commands/commands/adjustment_base.py

@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+import math
+
+class AdjustmentCommand():
+    """Base class for speech and sound adjustment commands"""
+    def __init__(self, section, setting, direction, step=0.1):
+        self.section = section  # 'speech' or 'sound'
+        self.setting = setting  # 'rate', 'pitch', 'volume'
+        self.direction = direction  # 'inc' or 'dec'
+        self.step = step
+        
+    def initialize(self, environment):
+        self.env = environment
+        
+    def shutdown(self):
+        pass
+        
+    def getDescription(self):
+        action = "Increase" if self.direction == 'inc' else "Decrease"
+        if self.section == 'speech':
+            return _(f'{action} the speech {self.setting}')
+        else:
+            return _(f'{action} the {self.section} {self.setting}')
+    
+    def run(self):
+        if self.section == 'sound' and self.setting == 'volume':
+            # Sound volume uses different method
+            self._adjust_sound_volume()
+        else:
+            # Speech rate, pitch, volume use standard method
+            self._adjust_speech_setting()
+        
+    def _adjust_speech_setting(self):
+        """Adjust speech settings (rate, pitch, volume)"""
+        value = self.env['runtime']['settingsManager'].getSettingAsFloat(self.section, self.setting)
+        
+        # Apply adjustment with rounding
+        if self.direction == 'inc':
+            value = round((math.ceil(10 * value) / 10) + self.step, 2)
+            if value > 1.0:
+                value = 1.0
+        else:  # dec
+            value = round((math.ceil(10 * value) / 10) - self.step, 2)
+            if value < 0.0:
+                value = 0.0
+        
+        # Set the new value
+        self.env['runtime']['settingsManager'].setSetting(self.section, self.setting, str(value))
+        
+        # Present feedback
+        percentage = int(value * 100)
+        if self.section == 'speech':
+            feedback = _("{0} percent speech {1}").format(percentage, self.setting)
+        else:
+            feedback = _("{0} percent {1} {2}").format(percentage, self.section, self.setting)
+            
+        self.env['runtime']['outputManager'].presentText(feedback, soundIcon='', interrupt=True)
+    
+    def _adjust_sound_volume(self):
+        """Adjust sound volume using same logic as speech"""
+        value = self.env['runtime']['settingsManager'].getSettingAsFloat(self.section, self.setting)
+        
+        # Sound volume uses same math as speech settings
+        if self.direction == 'inc':
+            value = round((math.ceil(10 * value) / 10) + self.step, 2)
+            if value > 1.0:
+                value = 1.0
+        else:  # dec
+            value = round((math.ceil(10 * value) / 10) - self.step, 2)
+            if value < 0.0:
+                value = 0.0
+        
+        # Set the new value
+        self.env['runtime']['settingsManager'].setSetting(self.section, self.setting, str(value))
+        
+        # Present feedback with appropriate sound icon
+        percentage = int(value * 100)
+        sound_icon = 'SoundOn' if self.direction == 'inc' else 'SoundOff'
+        feedback = _("{0} percent sound volume").format(percentage)
+        self.env['runtime']['outputManager'].presentText(feedback, soundIcon=sound_icon, interrupt=True)
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/announce_fenrir_version.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader import fenrirVersion
 
 class command():

src/fenrirscreenreader/commands/commands/attribute_cursor.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import screen_utils
 
 class command():

src/fenrirscreenreader/commands/commands/bookmark_1.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '1'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(1, 'read')

src/fenrirscreenreader/commands/commands/bookmark_10.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '10'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(10, 'read')

src/fenrirscreenreader/commands/commands/bookmark_2.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '2'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(2, 'read')

src/fenrirscreenreader/commands/commands/bookmark_3.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '3'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(3, 'read')

src/fenrirscreenreader/commands/commands/bookmark_4.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '4'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(4, 'read')

src/fenrirscreenreader/commands/commands/bookmark_5.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '5'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(5, 'read')

src/fenrirscreenreader/commands/commands/bookmark_6.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '6'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(6, 'read')

src/fenrirscreenreader/commands/commands/bookmark_7.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '7'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(7, 'read')

src/fenrirscreenreader/commands/commands/bookmark_8.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '8'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(8, 'read')

src/fenrirscreenreader/commands/commands/bookmark_9.py

@@ -4,45 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '9'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(9, 'read')

src/fenrirscreenreader/commands/commands/bookmark_base.py

@@ -0,0 +1,150 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+import gettext
+_ = gettext.gettext
+
+from fenrirscreenreader.utils import mark_utils
+from fenrirscreenreader.utils import line_utils
+
+class BookmarkCommand():
+    """Base class for bookmark operations - read, set, clear"""
+    def __init__(self, bookmark_id, action='read'):
+        self.ID = str(bookmark_id)
+        self.action = action
+        
+    def initialize(self, environment):
+        self.env = environment
+        # Always initialize bookmark structure - all commands need this
+        if self.ID not in self.env['commandBuffer']['bookMarks']:
+            self.env['commandBuffer']['bookMarks'][self.ID] = {}
+                
+    def shutdown(self):
+        pass
+        
+    def getDescription(self):
+        if self.action == 'read':
+            return _('read Bookmark {0}').format(self.ID)
+        elif self.action == 'set':
+            return _('set Bookmark {0}').format(self.ID)
+        elif self.action == 'clear':
+            return _('remove Bookmark {0}').format(self.ID)
+        return f'{self.action} Bookmark {self.ID}'
+    
+    def run(self):
+        if self.action == 'read':
+            self._read_bookmark()
+        elif self.action == 'set':
+            self._set_bookmark()
+        elif self.action == 'clear':
+            self._clear_bookmark()
+    
+    def _read_bookmark(self):
+        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
+        
+        if not self.env['commandBuffer']['bookMarks'][self.ID]:
+            self.env['runtime']['outputManager'].presentText('Bookmark {0} not set'.format(self.ID), interrupt=True)
+            return
+            
+        if currApp not in self.env['commandBuffer']['bookMarks'][self.ID]:
+            self.env['runtime']['outputManager'].presentText('Bookmark for application {0} not set'.format(currApp), interrupt=True)
+            return
+            
+        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp].get('1'):
+            self.env['runtime']['outputManager'].presentText('Bookmark for application {0} not set'.format(currApp), interrupt=True)
+            return
+
+        # Get bookmarked text
+        marked = ''
+        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
+        
+        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
+            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
+            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
+        else:
+            x, y, marked = line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
+            
+        if marked.isspace():
+            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
+        else:
+            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
+    
+    def _set_bookmark(self):
+        if not self.env['commandBuffer']['Marks']['1']:
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
+            return
+            
+        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
+        self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
+        
+        self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'] = self.env['commandBuffer']['Marks']['1'].copy()
+        
+        if self.env['commandBuffer']['Marks']['2']:
+            self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'] = self.env['commandBuffer']['Marks']['2'].copy()
+        else:
+            self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'] = None
+            
+        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} set for application {1}').format(self.ID, currApp), interrupt=True)
+        
+        # Clear marks after setting bookmark
+        self.env['commandBuffer']['Marks']['1'] = None
+        self.env['commandBuffer']['Marks']['2'] = None
+    
+    def _clear_bookmark(self):
+        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
+        
+        if self.ID in self.env['commandBuffer']['bookMarks'] and currApp in self.env['commandBuffer']['bookMarks'][self.ID]:
+            del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
+            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
+        else:
+            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set for application {1}').format(self.ID, currApp), interrupt=True)
+        
+    def setCallback(self, callback):
+        pass
+
+# Factory function to create bookmark command instances
+def create_bookmark_commands():
+    """Create all bookmark command instances"""
+    commands = {}
+    
+    # Create read bookmark commands (bookmark_1 through bookmark_10)
+    for i in range(1, 11):
+        commands[f'bookmark_{i}'] = lambda i=i: BookmarkCommand(i, 'read')
+    
+    # Create set bookmark commands (set_bookmark_1 through set_bookmark_10)
+    for i in range(1, 11):
+        commands[f'set_bookmark_{i}'] = lambda i=i: BookmarkCommand(i, 'set')
+    
+    # Create clear bookmark commands (clear_bookmark_1 through clear_bookmark_10)
+    for i in range(1, 11):
+        commands[f'clear_bookmark_{i}'] = lambda i=i: BookmarkCommand(i, 'clear')
+        
+    return commands
+
+# For backwards compatibility, provide individual command classes
+# This allows the existing command loading system to work unchanged
+
+def _make_command_class(bookmark_id, action):
+    """Create a command class for a specific bookmark and action"""
+    class command(BookmarkCommand):
+        def __init__(self):
+            super().__init__(bookmark_id, action)
+    return command
+
+# Generate individual command classes for each bookmark operation
+# These will be used by the existing command loading system
+
+# Read bookmarks (bookmark_1.py style)
+for i in range(1, 11):
+    globals()[f'bookmark_{i}_command'] = _make_command_class(i, 'read')
+
+# Set bookmarks (set_bookmark_1.py style)  
+for i in range(1, 11):
+    globals()[f'set_bookmark_{i}_command'] = _make_command_class(i, 'set')
+
+# Clear bookmarks (clear_bookmark_1.py style)
+for i in range(1, 11):
+    globals()[f'clear_bookmark_{i}_command'] = _make_command_class(i, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_1.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '1'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(1, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_10.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '10'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(10, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_2.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '2'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(2, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_3.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '3'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(3, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_4.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '4'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(4, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_5.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '5'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(5, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_6.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '6'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(6, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_7.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '7'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(7, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_8.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '8'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(8, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_9.py

@@ -4,24 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'bookmark_base.py')
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '9'
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__(9, 'clear')

src/fenrirscreenreader/commands/commands/clear_clipboard.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/clear_window_application.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 
 class command():

src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/curr_clipboard.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/curr_screen.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 
 class command():

src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 
 class command():

src/fenrirscreenreader/commands/commands/current_quick_menu_entry.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/current_quick_menu_value.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/cursor_column.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/cursor_lineno.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/cursor_position.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/cursor_read_line_to_cursor.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/date.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 import datetime
 
 class command():

src/fenrirscreenreader/commands/commands/dec_alsa_volume.py

@@ -4,36 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-initialized = False
-try:
-    import alsaaudio
-    initialized = True
-except:
-    pass
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-from fenrirscreenreader.core import debug
-
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _("Decrease system volume")         
-
-    def run(self):
-        if not initialized:
-           self.env['runtime']['outputManager'].presentText(_('alsaaudio is not installed'), interrupt=True) 
-           return
-        mixer = alsaaudio.Mixer()
-        value = mixer.getvolume()[0]
-        value = value - 5
-        if value < 5:
-            value = 5
-        mixer.setvolume(value)
-        self.env['runtime']['outputManager'].presentText(_("{0} percent system volume").format(value), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__('alsa', 'volume', 'dec')

src/fenrirscreenreader/commands/commands/dec_sound_volume.py

@@ -4,30 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-import math
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('decrease sound volume')        
-
-    def run(self):
-        
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('sound', 'volume')
-
-        value = round((math.ceil(10 * value) / 10) - 0.1, 2)
-        if value < 0.1:
-            value = 0.1  
-        self.env['runtime']['settingsManager'].setSetting('sound', 'volume', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent sound volume").format(int(value * 100)), soundIcon='SoundOff', interrupt=True)
-   
-    def setCallback(self, callback):
-        pass
-
+        super().__init__('sound', 'volume', 'dec')

src/fenrirscreenreader/commands/commands/dec_speech_pitch.py

@@ -4,26 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-import math
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Decreases the pitch of the speech')        
-    
-    def run(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'pitch')
-        value = round((math.ceil(10 * value) / 10) - 0.1, 2)
-        if value < 0.0:
-            value = 0.0 
-        self.env['runtime']['settingsManager'].setSetting('speech', 'pitch', str(value))   
-        self.env['runtime']['outputManager'].presentText(_('{0} percent speech pitch').format(int(value * 100)), soundIcon='', interrupt=True)
- 
-    def setCallback(self, callback):
-        pass
+        super().__init__('speech', 'pitch', 'dec')

src/fenrirscreenreader/commands/commands/dec_speech_rate.py

@@ -4,27 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-import math
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Decreases the rate of the speech')        
-    
-    def run(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'rate')
-        value = round((math.ceil(10 * value) / 10) - 0.1, 2)
-        if value < 0.0:
-            value = 0.0 
-        self.env['runtime']['settingsManager'].setSetting('speech', 'rate', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech rate").format(int(value * 100)), soundIcon='', interrupt=True)
-  
-    def setCallback(self, callback):
-        pass
+        super().__init__('speech', 'rate', 'dec')

src/fenrirscreenreader/commands/commands/dec_speech_volume.py

@@ -4,28 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-import math
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Decreases the volume of the speech')        
-    
-    def run(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'volume')
-        value = round((math.ceil(10 * value) / 10) - 0.1, 2)
-        if value < 0.1:
-            value = 0.1  
-        self.env['runtime']['settingsManager'].setSetting('speech', 'volume', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech volume").format(int(value * 100)), soundIcon='', interrupt=True)
-
-    def setCallback(self, callback):
-        pass
-
+        super().__init__('speech', 'volume', 'dec')

src/fenrirscreenreader/commands/commands/exit_review.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 import os
 import importlib
 import _thread

src/fenrirscreenreader/commands/commands/first_clipboard.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/forward_keypress.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 import os
 

src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 import importlib
 import _thread
 import pyperclip

src/fenrirscreenreader/commands/commands/inc_alsa_volume.py

@@ -4,36 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-initialized = False
-try:
-    import alsaaudio
-    initialized = True
-except:
-    pass
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-from fenrirscreenreader.core import debug
-
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _("Increase system volume")         
-
-    def run(self):
-        if not initialized:
-           self.env['runtime']['outputManager'].presentText(_('alsaaudio is not installed'), interrupt=True) 
-           return
-        mixer = alsaaudio.Mixer()
-        value = mixer.getvolume()[0]
-        value = value + 5
-        if value > 100:
-            value = 100
-        mixer.setvolume(value)
-        self.env['runtime']['outputManager'].presentText(_("{0} percent system volume").format(value), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+        super().__init__('alsa', 'volume', 'inc')

src/fenrirscreenreader/commands/commands/inc_sound_volume.py

@@ -4,29 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-import math
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('adjusts the volume for in coming sounds')        
-
-    def run(self):
-        
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('sound', 'volume')
-
-        value = round((math.ceil(10 * value) / 10) + 0.1, 2)
-        if value > 1.0:
-            value = 1.0  
-        self.env['runtime']['settingsManager'].setSetting('sound', 'volume', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent sound volume").format(int(value * 100)),  soundIcon='SoundOn', interrupt=True)
- 
-    def setCallback(self, callback):
-        pass
+        super().__init__('sound', 'volume', 'inc')

src/fenrirscreenreader/commands/commands/inc_speech_pitch.py

@@ -4,27 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-import math
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Increases the pitch of the speech')        
-    
-    def run(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'pitch')
-        value = round((math.ceil(10 * value) / 10) + 0.1, 2)
-        if value > 1.0:
-            value = 1.0  
-        self.env['runtime']['settingsManager'].setSetting('speech', 'pitch', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech pitch").format(int(value * 100)), soundIcon='', interrupt=True)
-   
-    def setCallback(self, callback):
-        pass
+        super().__init__('speech', 'pitch', 'inc')

src/fenrirscreenreader/commands/commands/inc_speech_rate.py

@@ -4,27 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-import math
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Increase the speech rate')        
-    
-    def run(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'rate')
-        value = round((math.ceil(10 * value) / 10) + 0.1, 2)
-        if value > 1.0:
-            value = 1.0  
-        self.env['runtime']['settingsManager'].setSetting('speech', 'rate', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech rate").format(int(value * 100)), soundIcon='', interrupt=True)
- 
-    def setCallback(self, callback):
-        pass
+        super().__init__('speech', 'rate', 'inc')

src/fenrirscreenreader/commands/commands/inc_speech_volume.py

@@ -4,27 +4,14 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-import math
+import os
+import importlib.util
+_base_path = os.path.join(os.path.dirname(__file__), 'adjustment_base.py')
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+AdjustmentCommand = _module.AdjustmentCommand
 
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Increase the speech volume')        
-    
-    def run(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'volume')
-        value = round((math.ceil(10 * value) / 10) + 0.1, 2)
-        if value > 1.0:
-            value = 1.0  
-        self.env['runtime']['settingsManager'].setSetting('speech', 'volume', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech volume").format(int(value * 100)), soundIcon='', interrupt=True)
-  
-    def setCallback(self, callback):
-        pass
+        super().__init__('speech', 'volume', 'inc')

src/fenrirscreenreader/commands/commands/indent_curr_line.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/last_clipboard.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/marked_text.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 
 class command():

src/fenrirscreenreader/commands/commands/next_clipboard.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/next_quick_menu_entry.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/next_quick_menu_value.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/paste_clipboard.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 import time
 
 class command():

src/fenrirscreenreader/commands/commands/present_first_line.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/present_last_line.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/prev_clipboard.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/prev_quick_menu_entry.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/prev_quick_menu_value.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/progress_bar_monitor.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 import re
 import time
 import threading
@@ -58,7 +57,11 @@ class command():
         # Don't control speech - progress monitor is beep-only
             
     def detectProgress(self, text):
-        if not self.env['runtime']['progressMonitoring']:
+        if not self.env['commandBuffer']['progressMonitoring']:
+            return
+            
+        # Skip progress detection if current screen looks like a prompt
+        if self.isCurrentLinePrompt():
             return
             
         currentTime = time.time()
@@ -67,10 +70,10 @@ class command():
         percentMatch = re.search(r'(\d+(?:\.\d+)?)\s*%', text)
         if percentMatch:
             percentage = float(percentMatch.group(1))
-            if percentage != self.env['runtime']['lastProgressValue']:
+            if percentage != self.env['commandBuffer']['lastProgressValue']:
                 self.playProgressTone(percentage)
-                self.env['runtime']['lastProgressValue'] = percentage
-                self.env['runtime']['lastProgressTime'] = currentTime
+                self.env['commandBuffer']['lastProgressValue'] = percentage
+                self.env['commandBuffer']['lastProgressTime'] = currentTime
             return
             
         # Pattern 2: Fraction (15/100, 3 of 10, etc.)
@@ -80,32 +83,35 @@ class command():
             total = int(fractionMatch.group(2))
             if total > 0:
                 percentage = (current / total) * 100
-                if percentage != self.env['runtime']['lastProgressValue']:
+                if percentage != self.env['commandBuffer']['lastProgressValue']:
                     self.playProgressTone(percentage)
-                    self.env['runtime']['lastProgressValue'] = percentage
-                    self.env['runtime']['lastProgressTime'] = currentTime
+                    self.env['commandBuffer']['lastProgressValue'] = percentage
+                    self.env['commandBuffer']['lastProgressTime'] = currentTime
                 return
                 
         # Pattern 3: Progress bars ([####    ], [====>   ], etc.)
-        barMatch = re.search(r'\[([#=\-\*]+)([^\]]*)\]', text)
+        # Improved pattern to avoid matching IRC channels like [#channel]
+        barMatch = re.search(r'\[([#=\-\*]+)([\s\.]*)\]', text)
         if barMatch:
             filled = len(barMatch.group(1))
-            total = filled + len(barMatch.group(2))
-            if total > 0:
+            unfilled = len(barMatch.group(2))
+            total = filled + unfilled
+            # Require at least 2 progress chars total and unfilled portion must be spaces/dots
+            if total >= 2 and (not barMatch.group(2) or re.match(r'^[\s\.]*$', barMatch.group(2))):
                 percentage = (filled / total) * 100
-                if percentage != self.env['runtime']['lastProgressValue']:
+                if percentage != self.env['commandBuffer']['lastProgressValue']:
                     self.playProgressTone(percentage)
-                    self.env['runtime']['lastProgressValue'] = percentage
-                    self.env['runtime']['lastProgressTime'] = currentTime
+                    self.env['commandBuffer']['lastProgressValue'] = percentage
+                    self.env['commandBuffer']['lastProgressTime'] = currentTime
                 return
                 
         # Pattern 4: Generic activity indicators (Loading..., Working..., etc.)
         activityPattern = re.search(r'(loading|processing|working|installing|downloading|compiling|building).*\.{2,}', text, re.IGNORECASE)
         if activityPattern:
             # Play a steady beep every 2 seconds for ongoing activity
-            if currentTime - self.env['runtime']['lastProgressTime'] >= 2.0:
+            if currentTime - self.env['commandBuffer']['lastProgressTime'] >= 2.0:
                 self.playActivityBeep()
-                self.env['runtime']['lastProgressTime'] = currentTime
+                self.env['commandBuffer']['lastProgressTime'] = currentTime
                 
     def playProgressTone(self, percentage):
         # Map 0-100% to 400-1200Hz frequency range
@@ -116,6 +122,88 @@ class command():
     def playActivityBeep(self):
         # Single tone for generic activity
         self.env['runtime']['outputManager'].playFrequence(800, 0.1, interrupt=False)
+    
+    def isCurrentLinePrompt(self):
+        """Check if the current line looks like a standalone prompt (not command with progress)"""
+        import re
+        
+        try:
+            # Get the current screen content
+            if not self.env['screen']['newContentText']:
+                return False
+                
+            lines = self.env['screen']['newContentText'].split('\n')
+            if not lines:
+                return False
+            
+            # Check the last line (most common) and current cursor line for prompt patterns
+            linesToCheck = []
+            
+            # Add last line (most common for prompts)
+            if lines:
+                linesToCheck.append(lines[-1])
+            
+            # Add current cursor line if different from last line
+            if (self.env['screen']['newCursor']['y'] < len(lines) and 
+                self.env['screen']['newCursor']['y'] != len(lines) - 1):
+                linesToCheck.append(lines[self.env['screen']['newCursor']['y']])
+            
+            # Standalone prompt patterns (no commands mixed in)
+            standalonePromptPatterns = [
+                r'^\s*\$\s*$',  # Just $ (with whitespace)
+                r'^\s*#\s*$',   # Just # (with whitespace)  
+                r'^\s*>\s*$',   # Just > (with whitespace)
+                r'^\[.*\]\s*[\\\$#>]\s*$',  # [path]$ without commands
+                r'^[a-zA-Z0-9._-]+[\\\$#>]\s*$',  # bash-5.1$ without commands
+                
+                # Interactive prompt patterns (these ARE standalone)
+                r'.*\?\s*\[[YyNn]/[YyNn]\]\s*$',  # ? [Y/n] or ? [y/N] style
+                r'.*\?\s*\[[Yy]es/[Nn]o\]\s*$',  # ? [Yes/No] style
+                r'.*continue\?\s*\[[YyNn]/[YyNn]\].*$',  # "continue? [Y/n]" style
+                r'^::.*\?\s*\[[YyNn]/[YyNn]\].*$',  # pacman style prompts
+                
+                # Authentication prompts (these ARE standalone)
+                r'^\[[Ss]udo\]\s*[Pp]assword\s*for\s+.*:\s*$',  # [sudo] password
+                r'^[Pp]assword\s*:\s*$',  # Password:
+                r'.*[Pp]assword\s*:\s*$',  # general password prompts
+                
+                # Continuation prompts (these ARE standalone)
+                r'^[Pp]ress\s+any\s+key\s+to\s+continue.*$',  # Press any key
+                r'^[Aa]re\s+you\s+sure\?\s*.*$',  # Are you sure?
+            ]
+            
+            for line in linesToCheck:
+                line = line.strip()
+                if not line:
+                    continue
+                
+                # Check if this line contains both a prompt AND other content (like commands)
+                # If so, don't treat it as a standalone prompt
+                hasPromptMarker = bool(re.search(r'.*@.*[\\\$#>]', line) or re.search(r'^\[.*\]\s*[\\\$#>]', line))
+                if hasPromptMarker:
+                    # If line has prompt marker but also has significant content after it, 
+                    # it's a command line, not a standalone prompt
+                    promptEnd = max(
+                        line.rfind('$'), 
+                        line.rfind('#'), 
+                        line.rfind('>'),
+                        line.rfind('\\')
+                    )
+                    if promptEnd >= 0 and promptEnd < len(line) - 5:  # More than just whitespace after prompt
+                        continue  # This is a command line, not a standalone prompt
+                    
+                for pattern in standalonePromptPatterns:
+                    try:
+                        if re.search(pattern, line):
+                            return True
+                    except re.error:
+                        continue
+                        
+            return False
+            
+        except Exception:
+            # If anything fails, assume it's not a prompt to be safe
+            return False
         
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/quit_fenrir.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/remove_marks.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 import string
 initialized = False

src/fenrirscreenreader/commands/commands/review_bottom.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/review_curr_char.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():
@@ -23,7 +22,7 @@ class command():
         self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], currChar = \
           char_utils.getCurrentChar(self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])
         
-        self.env['runtime']['outputManager'].presentText(currChar ,interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)
+        char_utils.presentCharForReview(self.env, currChar, interrupt=True, announceCapital=True, flush=False)
         # is has attribute it enabled?    
         if self.env['runtime']['settingsManager'].getSettingAsBool('general', 'hasAttributes'):
             cursorPos = self.env['screen']['newCursorReview']

src/fenrirscreenreader/commands/commands/review_curr_char_phonetic.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_curr_line.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_curr_word.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 from fenrirscreenreader.utils import char_utils
 

src/fenrirscreenreader/commands/commands/review_down.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_line_begin.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_line_end.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_line_first_char.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 from fenrirscreenreader.utils import char_utils
 
@@ -29,7 +28,7 @@ class command():
         self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], currChar = \
           char_utils.getCurrentChar(self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])       
 
-        self.env['runtime']['outputManager'].presentText(currChar ,interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)        
+        char_utils.presentCharForReview(self.env, currChar, interrupt=True, announceCapital=True, flush=False)        
         self.env['runtime']['outputManager'].presentText(_("first character in line indent {0}").format(str(len(currLine) - len(currLine.lstrip()))), interrupt=False)
    
     def setCallback(self, callback):

src/fenrirscreenreader/commands/commands/review_line_last_char.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():
@@ -23,7 +22,7 @@ class command():
         self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], lastChar = \
           char_utils.getLastCharInLine(self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])
         
-        self.env['runtime']['outputManager'].presentText(lastChar ,interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)        
+        char_utils.presentCharForReview(self.env, lastChar, interrupt=True, announceCapital=True, flush=False)        
         self.env['runtime']['outputManager'].presentText(_("last character in line"), interrupt=False)
    
     def setCallback(self, callback):

src/fenrirscreenreader/commands/commands/review_next_char.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():
@@ -22,7 +21,7 @@ class command():
         self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], nextChar, endOfScreen, lineBreak = \
           char_utils.getNextChar(self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])
 
-        self.env['runtime']['outputManager'].presentText(nextChar, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)
+        char_utils.presentCharForReview(self.env, nextChar, interrupt=True, announceCapital=True, flush=False)
         if endOfScreen:
             if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):        
                 self.env['runtime']['outputManager'].presentText(_('end of screen'), interrupt=True, soundIcon='EndOfScreen')                 

src/fenrirscreenreader/commands/commands/review_next_char_phonetic.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_next_line.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_next_word.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 from fenrirscreenreader.utils import char_utils
 

src/fenrirscreenreader/commands/commands/review_prev_char.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():
@@ -25,7 +24,7 @@ class command():
         self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], prevChar, endOfScreen, lineBreak = \
           char_utils.getPrevChar(self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])
         
-        self.env['runtime']['outputManager'].presentText(prevChar, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)
+        char_utils.presentCharForReview(self.env, prevChar, interrupt=True, announceCapital=True, flush=False)
         if endOfScreen:
             if self.env['runtime']['settingsManager'].getSettingAsBool('review', 'endOfScreen'):        
                 self.env['runtime']['outputManager'].presentText(_('end of screen'), interrupt=True, soundIcon='EndOfScreen')                 

src/fenrirscreenreader/commands/commands/review_prev_char_phonetic.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_prev_line.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_prev_word.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 from fenrirscreenreader.utils import char_utils
 

src/fenrirscreenreader/commands/commands/review_screen_first_char.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():
@@ -23,7 +22,7 @@ class command():
         self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], lastChar = \
           char_utils.getLastCharInLine(self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])
         
-        self.env['runtime']['outputManager'].presentText(lastChar ,interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)
+        char_utils.presentCharForReview(self.env, lastChar, interrupt=True, announceCapital=True, flush=False)
         self.env['runtime']['outputManager'].presentText(_("first character in screen"), interrupt=False)
    
     def setCallback(self, callback):

src/fenrirscreenreader/commands/commands/review_screen_last_char.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():
@@ -23,7 +22,7 @@ class command():
         self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], lastChar = \
           char_utils.getLastCharInLine(self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])
         
-        self.env['runtime']['outputManager'].presentText(lastChar ,interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)
+        char_utils.presentCharForReview(self.env, lastChar, interrupt=True, announceCapital=True, flush=False)
         self.env['runtime']['outputManager'].presentText(_("last character in screen"), interrupt=False)
    
     def setCallback(self, callback):

src/fenrirscreenreader/commands/commands/review_top.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():

src/fenrirscreenreader/commands/commands/review_up.py

@@ -4,7 +4,6 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import char_utils
 
 class command():