Fixed version for master branch.

?

README.md

@@ -5,7 +5,7 @@ It should run on any operating system. If you want to help, or write drivers to
 This software is licensed under the LGPL v3.
 
 
-# OS Requirements
+## OS Requirements
 
 - Linux (ptyDriver, vcsaDriver, evdevDriver)
 - macOS (ptyDriver)
@@ -13,15 +13,15 @@ This software is licensed under the LGPL v3.
 - Windows (ptyDriver)
 
 
-# Core Requirements
+## Core Requirements
 
 - python3 >= 3.3
-- screen, input, speech, sound or braille drivers dependencies see "Features, Drivers, Extras".
+- screen, input, speech, sound drivers dependencies see "Features, Drivers, Extras".
 
 
-# Features, Drivers, Extras, Dependencies
+## Features, Drivers, Extras, Dependencies
 
-# Input Drivers:
+### Input Drivers:
 1. "evdevDriver" input driver for linux evdev
   - python-evdev >=0.6.3 (This is commonly referred to as python3-evdev by your distribution)
   - python-pyudev
@@ -33,7 +33,7 @@ This software is licensed under the LGPL v3.
   - python-pyte
 
 
-# Screen Drivers:
+### Screen Drivers:
 
 1. "vcsaDriver" screen driver for linux VCSA devices
   - python-dbus
@@ -46,27 +46,18 @@ This software is licensed under the LGPL v3.
   - python-pyte
   
 
-# Speech Drivers:
+### Speech Drivers:
 
 1. "genericDriver" (default) speech driver for sound as subprocess:
   - espeak or espeak-ng
-2. "espeakDriver" speech driver for Espeak or Espeak-NG:
-  - python-espeak
-3. "speechdDriver" speech driver for Speech-dispatcher:
+2. "speechdDriver" speech driver for Speech-dispatcher:
   - Speech-dispatcher
   - python-speechd
-4. "emacspeakDriver" speech driver for emacspeak
+3. "emacspeakDriver" speech driver for emacspeak
   - emacspeak
 
 
-# Braille Drivers:
-
-1. "BrlttyDriver" braille driver (WIP):
-  - brltty (configured and running)
-  - python-brlapi
-
-
-# Sound Drivers:
+### Sound Drivers:
 
 1. "genericDriver" (default) sound driver for sound as subprocess:
   - Sox
@@ -75,7 +66,7 @@ This software is licensed under the LGPL v3.
   - GLib
 
 
-# Extras:
+## Extras:
 
 1. spellchecker
   - python-pyenchant
@@ -86,38 +77,32 @@ This software is licensed under the LGPL v3.
   - pyalsaaudio (needs libasound2's headers).
 
 
-# installation
+## installation
 
 If there is a package for your distrobution of choice, please let us know so we can add it here.
 
-- Archlinux: PKGBUILD in AUR (fenrir-git recommended)
-- PIP: sudo pip install fenrir-screenreader
+- Archlinux: PKGBUILD in AUR
+  - fenrir: stable release
+  - fenrir-git: Bleeding edge release
 - Manual:
- - install "espeak" and "sox" with your package manager
- - sudo pip install -r requirements.txt 
- - run install.sh or uninstall.sh as root
-- you also can just run it from Git without installing:
-You can just run the following as root:
-if you are in Fenrir Git rootfolder:
+  - install "espeak" and "sox" with your package manager
+  - sudo pip install -r requirements.txt 
+  - run install.sh or uninstall.sh as root
+- You can also just run it from Git without installing:
+Requires root privileges
 
     cd src/fenrir/
     sudo ./fenrir
 
-Same thing, but use the daemon so the terminal is not blocked:
-
-    cd src/fenrir/
-    sudo ./fenrir-daemon
-
 Settings "settings.conf" is located in the "config" directory or after installation in /etc/fenrir/settings.
 Take care to use drivers from the config matching your installed drivers. 
 By default it uses:
 - sound driver: genericDriver (via sox, could configured in settings.conf)
 - speech driver: genericDriver (via espeak or espeak-ng, could configured in settings.conf)
-- braille driver: brlttyDriver (WIP)
 - input driver: evdevDriver
 
 
-# Configure pulseaudio
+## Configure pulseaudio
 
 Pulseaudio by default only plays sound for the user its currently running for. As fenrir is running as root, your local user does not hear the sound and speech produced by fenrir.
 for this fenrir provides a script to configure pulseaudio to stream the sound played as root to your local user. This is not a issue of fenrir but this is how pulseaudio works.
@@ -130,7 +115,7 @@ just run the configuration script twice (once as user, once as root):
 The script is also located in the tools directory in git
 
 
-# Configure pipewire
+## Configure pipewire
 
 Pipewire by default only plays sound for the user its currently running for. As fenrir is running as root, your local user does not hear the sound and speech produced by fenrir.
 for this fenrir provides a script to configure pipewire to stream the sound played as root to your local user. This is not a issue of fenrir but this is how pipewire works.
@@ -142,10 +127,12 @@ just run the configuration script twice (once as user, once as root):
 
 The script is also located in the tools directory in git
 
-# localization
+## localization
 copy fenrir.mo translations file  from fenrir/locale/your_language/LC_MESSAGES/fenrir.mo to /usr/share/locale/your_language/LC_MESSAGES/fenrir.mo
 
  
-# Documentation
+## Documentation and Support
 
-Here is the [Fenrir Wiki](https://github.com/chrys87/fenrir/wiki). It is currently being updated, so keep checking back. Feel free to help with documentation.
+- Email list: [stormux+subscribe@groups.io](mailto:stormux+subscribe@groups.io?subject=subscribe) with the subject subscribe.
+- [Fenrir Wiki](https://git.stormux.org/storm/fenrir/wiki)
+- IRC: irc.stormux.org #stormux

autostart/runit/fenrir/run

@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec fenrir
+exec fenrir -f

autostart/systemd/Arch/fenrir.service

@@ -1,18 +1,15 @@
 [Unit]
 Description=Fenrir screenreader
 Wants=systemd-udev-settle.service
-After=systemd-udev-settle.service sound.target
+After=systemd-udev-settle.service getty.target
 [Service]
 Type=forking
 PIDFile=/var/run/fenrir.pid
-ExecStart=/usr/bin/fenrir-daemon
+ExecStart=/usr/bin/fenrir
 ExecReload=/usr/bin/kill -HUP $MAINPID
 Restart=always
 #Group=fenrirscreenreader
 #User=fenrirscreenreader
 
 [Install]
-# start as early as possible in boot process
-#WantedBy=sound.target
-# start as soon the login prompt is available
 WantedBy=getty.target

autostart/systemd/Debian/fenrir.service

@@ -5,7 +5,7 @@ After=systemd-udev-settle.service sound.target
 [Service]
 Type=forking
 PIDFile=/var/run/fenrir.pid
-ExecStart=/usr/local/bin/fenrir-daemon
+ExecStart=/usr/local/bin/fenrir
 ExecReload=/usr/bin/kill -HUP $MAINPID
 Restart=always
 #Group=fenrirscreenreader

check-dependencies.py

@@ -1,232 +1,134 @@
-#!/bin/env python3
-import os, sys
+#!/usr/bin/env python3
 
-# default installation
-# core
-# speech: speech-dispatcher
-# sound: sox
-# braille: brltty:
-defaultInstallation = ['FenrirCore','vcsaDriver','dummyDriver (braille)','evdevDriver','genericDriver (speech)', 'genericDriver (sound)']
-currentInstallation = []
+import os
+import sys
+from dataclasses import dataclass
+from typing import List, Optional
 
-print('checking dependencys...')
-# CORE
-print('')
-print('fenrir core:')
-available = True
-try:
-    from daemonize import Daemonize
-    print('python3-daemonize: OK')
-except:
-    print('python3-daemonize: FAIL')
-    available = available and False
+@dataclass
+class Dependency:
+    name: str
+    depType: str  # screen, input, sound, speech, core
+    moduleName: str
+    checkCommands: Optional[List[str]] = None  # Command-line tools to check
+    pythonImports: Optional[List[str]] = None  # Python packages to check
+    devicePaths: Optional[List[str]] = None    # Device files to check
+
+def check_dependency(dep: Dependency) -> bool:
+    """Check if a single dependency is satisfied."""
+    isAvailable = True
     
-try:
-    import enchant
-    print('pyenchant: OK')
-except:
-    print('pyenchant: FAIL')
-    available = available and False
-    
-if available:
-    currentInstallation.append('FenrirCore')
-    
-# SCREEN
-print('--------------------')
-print('screen driver')
-# dummy and debug
-print('dummyDriver (screen): OK')
-currentInstallation.append('dummyDriver (screen)')
+    if dep.pythonImports:
+        for package in dep.pythonImports:
+            try:
+                moduleName = package.split('.')[0]
+                __import__(moduleName)
+                print(f'{package}: OK')
+            except ImportError:
+                print(f'{package}: FAIL')
+                isAvailable = False
 
-# VCSA (screen driver)
-print('vcsaDriver')
-available = True
-try:
-    import dbus
-    print('python3-dbus: OK')
-except:
-    print('python3-dbus: FAIL')
-    available = available and False
-if os.path.exists('/dev/vcsa'):
-    print('VCSA Device: OK')
-else:    
-    print('VCSA Device: FAIL')
-    available = available and False    
-if available:
-    currentInstallation.append('vcsaDriver')
-print('')
-# pty emulation (screen driver)
-print('ptyDriver')
-available = True
-try:
-    import pyte
-    print('pyte: OK')
-except:
-    print('pyte: FAIL')
-    available = available and False    
-if available:
-    currentInstallation.append('ptyDriver (screen)') 
+    if dep.checkCommands:
+        for cmd in dep.checkCommands:
+            if os.path.exists(f'/usr/bin/{cmd}') or os.path.exists(f'/bin/{cmd}'):
+                print(f'{cmd}: OK')
+            else:
+                print(f'{cmd}: FAIL')
+                isAvailable = False
+
+    if dep.devicePaths:
+        for path in dep.devicePaths:
+            if os.path.exists(path):
+                print(f'{path}: OK')
+            else:
+                print(f'{path}: FAIL')
+                isAvailable = False
+
+    return isAvailable
+
+# Define all dependencies
+dependencyList = [
+    # Core dependencies
+    Dependency('FenrirCore', 'core', 'core', 
+              pythonImports=['daemonize', 'enchant']),
     
-# BRAILLE
-print('--------------------')
-print('braille driver')
-# dummy and debug
-print('dummyDriver (braille): OK')
-currentInstallation.append('dummyDriver (braille)')
-print('debugDriver (braille): OK')
-currentInstallation.append('debugDriver (braille)')
-# brltty (braille driver)
-print('brlapiDriver')
-available = True
-try:
-    import brlapi
-    print('python3-brlapi: OK')
-except:
-    print('python3-brlapi: FAIL')
-    available = available and False
+    # Screen drivers
+    Dependency('DummyScreen', 'screen', 'dummyDriver'),
+    Dependency('VCSA', 'screen', 'vcsaDriver',
+              pythonImports=['dbus'],
+              devicePaths=['/dev/vcsa']),
+    Dependency('PTY', 'screen', 'ptyDriver',
+              pythonImports=['pyte']),
+              
+    # Input drivers
+    Dependency('DummyInput', 'input', 'dummyDriver'),
+    Dependency('DebugInput', 'input', 'debugDriver'),
+    Dependency('Evdev', 'input', 'evdevDriver',
+              pythonImports=['evdev', 'evdev.InputDevice', 'evdev.UInput', 'pyudev']),
+    Dependency('PTYInput', 'input', 'ptyDriver',
+              pythonImports=['pyte']),
+              
+    # Sound drivers
+    Dependency('DummySound', 'sound', 'dummyDriver'),
+    Dependency('DebugSound', 'sound', 'debugDriver'),
+    Dependency('GenericSound', 'sound', 'genericDriver',
+              checkCommands=['play', 'sox']),
+    Dependency('GStreamer', 'sound', 'gstreamerDriver',
+              pythonImports=['gi', 'gi.repository.GLib', 'gi.repository.Gst']),
+              
+    # Speech drivers
+    Dependency('DummySpeech', 'speech', 'dummyDriver'),
+    Dependency('DebugSpeech', 'speech', 'debugDriver'),
+    Dependency('Speechd', 'speech', 'speechdDriver',
+              pythonImports=['speechd']),
+    Dependency('GenericSpeech', 'speech', 'genericDriver',
+              checkCommands=['espeak-ng'])
+]
+
+defaultModules = {
+    'FenrirCore',
+    'VCSA',
+    'Evdev',
+    'GenericSpeech',
+    'GenericSound'
+}
+
+def check_all_dependencies():
+    print('Checking dependencies...\n')
+    availableModules = []
     
-if available:
-    currentInstallation.append('brlapiDriver')
-# INPUT
-print('--------------------')
-print('input driver')
-# dummy and debug
-print('dummyDriver (input): OK')
-currentInstallation.append('dummyDriver (input)')
-print('debugDriver (input): OK')
-currentInstallation.append('debugDriver (input)')
-# evdev (input driver)
-print('evdevDriver')
-available = True
-try:
-    import evdev
-    from evdev import InputDevice, UInput
-    print('python3-evdev: OK')
-except:
-    print('python3-evdev: FAIL')
-    available = available and False
-try:
-    import pyudev
-    print('python3-pyudev: OK')
-except:
-    print('python3-pyudev: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('evdevDriver')
-# pty emulation (input driver)
-print('')
-print('ptyDriver')
-available = True
-try:
-    import pyte
-    print('pyte: OK')
-except:
-    print('pyte: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('ptyDriver (Input)')
-# SOUND
-print('--------------------')
-print('sound driver')
-# dummy and debug
-print('dummyDriver (sound): OK')
-currentInstallation.append('dummyDriver (sound)')
-print('debugDriver (sound): OK')
-currentInstallation.append('debugDriver (sound)')
-print('genericDriver (uses sox by default)')
-available = True
-if os.path.exists('/usr/bin/play') and os.path.exists('/usr/bin/sox'):
-    print('sox: OK')
-else:
-    print('sox: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('genericDriver (sound)')
-print('')
-# gstreamer (sound driver)
-print('gstreamerDriver')
-available = True
-try:
-    import gi
-    print('gi: OK')
-except:
-    print('gi: FAIL')
-    available = available and False
-try:
-    from gi.repository import GLib 
-    print('gi GLib: OK')
-except:
-    print('gi GLib: FAIL')
-    available = available and False
-try:
-    gi.require_version('Gst', '1.0')
-    from gi.repository import Gst
-    print('gi Gst: OK')
-except:
-    print('gi Gst: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('gstreamerDriver')
+    # Group dependencies by type for organized output
+    for depType in ['core', 'screen', 'input', 'sound', 'speech']:
+        print(f'{depType.upper()} DRIVERS')
+        print('-' * 20)
+        
+        depsOfType = [d for d in dependencyList if d.depType == depType]
+        for dep in depsOfType:
+            print(f'\nChecking {dep.name}:')
+            if check_dependency(dep):
+                availableModules.append(dep.name)
+        print('')
 
-# SPEECH
-print('--------------------')
-print('speech driver')
-# dummy and debug
-print('dummyDriver (speech): OK')
-currentInstallation.append('dummyDriver (speech)')
-print('debugDriver (speech): OK')
-currentInstallation.append('debugDriver (speech)')
-# speechd (speech driver)
-print('speechdDriver')
-available = True
-try:
-    import speechd
-    print('python3-speechd: OK')
-except:
-    print('python3-speechd: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('speechdDriver')
-print('')
-# espeak (speech driver)
-print('espeakDriver')
-available = True
-try:
-    from espeak import espeak 
-    print('python3-espeak: OK')
-except:
-    print('python3-espeak: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('espeakDriver')
-print('genericDriver (uses espeak-ng by default)')
-available = True
-if os.path.exists('/usr/bin/espeak-ng') or os.path.exists('/bin/espeak-ng'):
-    print('espeak-ng: OK')
-else:
-    print('espeak-ng: FAIL')
-    available = available and False    
-if available:
-    currentInstallation.append('genericDriver (speech)')
+    print_summary(availableModules)
 
-# SUMMERY
-print('====================')
-available = True
-missing = []
-for element in  defaultInstallation:
-    if not element in currentInstallation:
-        available = False
-        missing.append(element)
-if available:
-    print('Default Setup: OK')
-else:
-    print('Default Setup: FAIL')    
-    print('Unavailable Default Modules:')
-    for e in missing:
-        print(e)
-    print('you may need to install the missing dependencys for the modules above or reconfigure fenrir to not use them')
-print('')
-print('Available Modules:')   
-for element in  currentInstallation:
-    print(element)
+def print_summary(availableModules: List[str]):
+    print('=' * 20)
+    print('SUMMARY')
+    print('=' * 20)
+    
+    missingModules = defaultModules - set(availableModules)
+    if missingModules:
+        print('Default Setup: FAIL')
+        print('\nUnavailable Default Modules:')
+        for module in missingModules:
+            print(f'- {module}')
+        print('\nYou may need to install the missing dependencies for the modules above or reconfigure fenrir to not use them.')
+    else:
+        print('Default Setup: OK')
 
+    print('\nAvailable Modules:')
+    for module in availableModules:
+        print(f'- {module}')
+
+if __name__ == '__main__':
+    check_all_dependencies()

config/keyboard/desktop.conf

@@ -125,3 +125,4 @@ KEY_FENRIR,KEY_F7=import_clipboard_from_x
 KEY_FENRIR,KEY_F8=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume
 KEY_FENRIR,KEY_CTRL,KEY_DOWN=dec_alsa_volume
+KEY_FENRIR,KEY_SHIFT,KEY_V=announce_fenrir_version

config/keyboard/laptop.conf

@@ -125,3 +125,4 @@ KEY_FENRIR,KEY_F7=import_clipboard_from_x
 KEY_FENRIR,KEY_F8=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume
 KEY_FENRIR,KEY_CTRL,KEY_DOWN=dec_alsa_volume
+KEY_FENRIR,KEY_SHIFT,KEY_V=announce_fenrir_version

config/punctuation/de.conf

@@ -46,28 +46,33 @@ _:===:Lienie unten
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/default.conf

@@ -46,27 +46,33 @@ _:===:line
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s+|'|"](Oo)|(oO)[\s+|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/en.conf

@@ -46,27 +46,33 @@ _:===:line
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s+|'|"][O|o][O|o][\s+|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/es.conf

@@ -46,28 +46,33 @@ _:===:subrayado
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/fr.conf

@@ -46,28 +46,33 @@ _:===:souligné
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/pl.conf

@@ -46,28 +46,33 @@ _:===:podkreślnik
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/rhvoice-en.conf

@@ -52,27 +52,33 @@ regex;(?i)shit:===:shitt
 regex;(?i)slither:===:slitther
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s+|'|"][O|o][O|o][\s+|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/settings/espeak.settings.conf

@@ -1,253 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are generic and gstreamer.
-# Sox is the default.
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your chosen soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituded
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequence to play
-# fenrirDuration = the duration of the frequence
-# the following command is used for play a soundfile
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile 2>/dev/null
-#the following command is used for generating a frequency beep
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence 2>/dev/null
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-#driver=speechdDriver
-#driver=genericDriver
-driver=espeakDriver
-
-# server path for emacspeak
-serverPath=
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.35
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help ti find out which modules are available.
-# The default is Espeak.
-module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-voice=f3
-
-# Select the language you want Fenrir to use.
-language=en_US
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module used in Speech-dispatcher, not every TTY needs this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# these are the minimum and maximum values of the TTS system used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and let consume keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-## echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=True
-# interrupt speech on any keypress
-interruptOnKeyPress=True
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# debugMode sets where the debug output should send to:
-# debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
-# debugMode=Print just prints on the screen
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-scriptPath=/usr/share/fenrirscreenreader/scripts
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-cursor=True
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-  
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-enabled=False
-presentTime=True
-presentDate=True
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon
-announce=True
-# interrupt current speech for time announcement
-interrupt=False
-

config/settings/settings-chime.conf

@@ -1,267 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
-#the following command is used to generate a frequency beep
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-# chrys: comment out genericDriver, uncomment speechdDriver
-driver=speechdDriver
-#driver=espeakDriver
-#driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is specified in speechd.conf.
-# chrys: uncomment module, set it to voxin (default espeak-ng)
-module=voxin
-
-# Voice selects the voice you want to use, for example, en-GB-scotland will use the Scotish English voice in Espeak,
-# To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-# You can add a variant by adding +name onto the end.
-# chrys: set voice (default was en-us)
-voice=allison-embedded-high
-
-# Select the language you want Fenrir to use.
-# chrys: uncomment language and set language to en-US (default was en)
-language=en
-
-# Read new text as it happens?
-autoReadIncoming=True
-
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False# genericSpeechCommand is the command that is executed for talking
-
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak-ng -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=True
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# debugMode sets where the debug output should send to:
-# debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
-# debugMode=Print just prints on the screen
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings-daemon.conf

@@ -1,263 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
-#the following command is used to generate a frequency beep
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-#driver=speechdDriver
-#driver=espeakDriver
-driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is espeak.
-#module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-voice=en-us
-
-# Select the language you want Fenrir to use.
-#language=english-us
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=False
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# debugMode sets where the debug output should send to:
-# debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
-# debugMode=Print just prints on the screen
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings-pty.conf

@@ -1,263 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
-#the following command is used to generate a frequency beep
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-#driver=speechdDriver
-#driver=espeakDriver
-driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is espeak.
-#module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-voice=en-us
-
-# Select the language you want Fenrir to use.
-#language=english-us
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=False
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# debugMode sets where the debug output should send to:
-# debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
-# debugMode=Print just prints on the screen
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings.conf

@@ -33,14 +33,11 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 enabled=True
 
 # Select speech driver, options are speechdDriver or genericDriver:
-#driver=speechdDriver
-driver=genericDriver
-
-# server path for emacspeak
-# serverPath=
+driver=speechdDriver
+#driver=genericDriver
 
 # The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
+rate=0.5
 
 # Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
 pitch=0.5
@@ -91,37 +88,6 @@ fenrirMaxPitch=99
 fenrirMinRate=80
 fenrirMaxRate=450
 
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
 [screen]
 driver=vcsaDriver
 encoding=auto

config/settings/settings.conf.dectalk

@@ -1,264 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
-#the following command is used to generate a frequency beep
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-#driver=speechdDriver
-#driver=espeakDriver
-driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.2
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is specified in speechd.conf.
-#module=espeak-ng
-
-# Voice selects the voice you want to use, for example, en-GB-scotland will use the Scotish English voice in Espeak,
-# To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-# You can add a variant by adding +name onto the end.
-voice=0
-
-# Select the language you want Fenrir to use.
-#language=en
-
-# Read new text as it happens?
-autoReadIncoming=True
-
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits = False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=/opt/dectalk/say -v fenrirVolume -r fenrirRate -s fenrirVoice -a "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=100
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=75
-fenrirMaxRate=600
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=1
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=True
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# debugMode sets where the debug output should send to:
-# debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
-# debugMode=Print just prints on the screen
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings.conf.example

@@ -1,264 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
-#the following command is used to generate a frequency beep
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver, emacspeak or espeakDriver:
-#driver=speechdDriver
-#driver=espeakDriver
-driver=genericDriver
-#driver=emacspeakDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is espeak.
-#module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-voice=en-us
-
-# Select the language you want Fenrir to use.
-#language=english-us
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits = False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=False
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# debugMode sets where the debug output should send to:
-# debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
-# debugMode=Print just prints on the screen
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKey=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKey" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-  
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings.conf.storm

@@ -1,204 +0,0 @@
-[sound]
-enabled=True
-driver=gstreamerDriver
-theme=default
-volume=0.5
-# shell commands for generic sound driver
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
-
-[speech]
-enabled=True
-driver=speechdDriver
-#driver=genericDriver
-serverPath=
-rate=0.80
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-module=espeak-ng
-voice=en-us
-language=en-us
-volume=0.6
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits = False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# these are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=890
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-grabDevices=True
-ignoreShortcuts=False
-keyboardLayout=desktop
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-charDeleteEcho=True
-wordEcho=False
-interruptOnKeyPress=True
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-autoPresentIndentMode=1
-debugLevel=0
-# debugMode sets where the debug output should send to:
-# debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
-# debugMode=Print just prints on the screen
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-fenrirKeys=KEY_KP0,KEY_CAPSLOCK
-scriptKeys=KEY_COMPOSE,KEY_META
-timeFormat=%H:%M:%P
-dateFormat="%A, %B %d, %Y"
-autoSpellCheck=True
-spellCheckLanguage=en_US
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-autoPresentIndent=False
-# play a sound when attributes are changeing
-hasAttributes=False
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=True
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after x seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00
-# announce via soundicon
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/speech-dispatcher.settings.conf

@@ -1,263 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
-#the following command is used to generate a frequency beep
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-driver=speechdDriver
-#driver=espeakDriver
-#driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is espeak.
-module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-voice=
-
-# Select the language you want Fenrir to use.
-language=english-us
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=False
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# debugMode sets where the debug output should send to:
-# debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
-# debugMode=Print just prints on the screen
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-  
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

docs/create_manpage.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # needs pandoc and php installed
 
 # remove old files

install.sh

@@ -1,12 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #Basic install script for Fenrir.
-read -p "This will install Fenrir. Press ctrl+C to cancel, or enter to continue." continue
+read -rp "This will install Fenrir. Press ctrl+C to cancel, or enter to continue."
 
 # Fenrir main application
 install -m755 -d /opt/fenrirscreenreader
 cp -af src/* /opt/fenrirscreenreader
 
-ln -fs /opt/fenrirscreenreader/fenrir-daemon /usr/bin/fenrir-daemon
 ln -fs /opt/fenrirscreenreader/fenrir /usr/bin/fenrir
 # tools
 install -m755 -d /usr/share/fenrirscreenreader/tools
@@ -33,8 +32,9 @@ cp -af config/sound/template /usr/share/sounds/fenrirscreenreader/template
 # config
 if [ -f "/etc/fenrirscreenreader/settings/settings.conf" ]; then
     echo "Do you want to overwrite your current global settings? (y/n)"
-    read yn
-    if [ $yn = "Y" -o $yn = "y" ]; then
+    read -r yn
+    yn="${yn:0:1}"
+    if [[ "${yn^}" == "Y" ]]; then
       mv /etc/fenrirscreenreader/settings/settings.conf /etc/fenrirscreenreader/settings/settings.conf.bak
       echo "Your old settings.conf has been backed up to settings.conf.bak."
       install -m644 -D "config/settings/settings.conf" /etc/fenrirscreenreader/settings/settings.conf

requirements.txt

@@ -3,5 +3,6 @@ daemonize>=2.5.0
 dbus-python>=1.2.8
 pyudev>=0.21.0
 pexpect
-pyttsx3
+pyperclip
 pyte>=0.7.0
+rapidfuzz>=2.0.0

setup.py

@@ -1,21 +1,29 @@
 #!/usr/bin/env python3
-#https://python-packaging.readthedocs.io/en/latest/minimal.html
 import os, glob, sys
 import os.path
 from shutil import copyfile
-from setuptools import find_packages
+from setuptools import find_namespace_packages
 from setuptools import setup
 
-fenrirVersion = '1.9.9'
-packageVersion = 'post1'
-
 # handle flags for package manager like aurman and pacaur.
-forceSettings = False
+# Allow both environment variable and command line flag
+forceSettingsFlag = (
+    "--force-settings" in sys.argv or
+    os.environ.get('FENRIR_FORCE_SETTINGS') == '1'
+)
 if "--force-settings" in sys.argv:
-    forceSettings = True
     sys.argv.remove("--force-settings")
 
-data_files = []
+dataFiles = []
+
+# Handle locale files
+localeFiles = glob.glob('locale/*/LC_MESSAGES/*.mo')
+for localeFile in localeFiles:
+    lang = localeFile.split(os.sep)[1]
+    destDir = f'/usr/share/locale/{lang}/LC_MESSAGES'
+    dataFiles.append((destDir, [localeFile]))
+
+# Handle other configuration files
 directories = glob.glob('config/*')
 for directory in directories:
     files = glob.glob(directory+'/*')
@@ -26,25 +34,25 @@ for directory in directories:
         destDir = '/etc/fenrirscreenreader/keyboard'
     elif 'config/settings' in directory:
         destDir = '/etc/fenrirscreenreader/settings'
-        if not forceSettings:
+        if not forceSettingsFlag:
             try:
-                del(files[files.index('config/settings/settings.conf')])
+                files = [f for f in files if not f.endswith('settings.conf')]
             except:
                 pass
     elif 'config/scripts' in directory:
         destDir = '/usr/share/fenrirscreenreader/scripts'
     if destDir != '':
-        data_files.append((destDir, files))
+        dataFiles.append((destDir, files))
 
 files = glob.glob('config/sound/default/*')
 destDir = '/usr/share/sounds/fenrirscreenreader/default'
-data_files.append((destDir, files))
+dataFiles.append((destDir, files))
 files = glob.glob('config/sound//template/*')
 destDir = '/usr/share/sounds/fenrirscreenreader/template'
-data_files.append((destDir, files))
+dataFiles.append((destDir, files))
 files = glob.glob('tools/*') 
-data_files.append(('/usr/share/fenrirscreenreader/tools', files))
-data_files.append(('/usr/share/man/man1', ['docs/fenrir.1']))
+dataFiles.append(('/usr/share/fenrirscreenreader/tools', files))
+dataFiles.append(('/usr/share/man/man1', ['docs/fenrir.1']))
 
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
@@ -52,15 +60,13 @@ def read(fname):
 setup(
     # Application name:
     name="fenrir-screenreader",
-    # Version number:
-    version=fenrirVersion + '.' + packageVersion,
     # description
     description="A TTY Screen Reader for Linux.",
     long_description=read('README.md'),
+    long_description_content_type="text/markdown",
     keywords=['screenreader', 'a11y', 'accessibility', 'terminal', 'TTY', 'console'],
     license="License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
     url="https://git.stormux.org/storm/fenrir/",
-    download_url = 'https://git.stormux.org/storm/fenrir/archive/' + fenrirVersion + '.tar.gz',	
     classifiers=[
         "Programming Language :: Python",
         "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
@@ -74,31 +80,35 @@ setup(
     author_email="storm_dragon@stormux.org",
 
     # Packages
-    packages=find_packages('src/'),
-    package_dir={'': 'src/'},
-    scripts=['src/fenrir','src/fenrir-daemon'],
+    package_dir={'': 'src'},
+    packages=find_namespace_packages(
+        where='src',
+        include=['fenrirscreenreader*']
+    ),
+    scripts=['src/fenrir'],
 
     # Include additional files into the package
     include_package_data=True,
     zip_safe=False,
 
-    data_files=data_files,
+    data_files=dataFiles,
 
     # Dependent packages (distributions)
+    python_requires='>=3.6',
     install_requires=[
         "evdev>=1.1.2",
         "daemonize>=2.5.0",
         "dbus-python>=1.2.8",
+        "pyperclip",
         "pyudev>=0.21.0",
+        "rapidfuzz>=2.0.0",
         "setuptools",
         "pexpect",
-        "pyttsx3",
         "pyte>=0.7.0",
     ],
-
 )
 
-if not forceSettings:
+if not forceSettingsFlag:
     print('')
     # create settings file from example if not exist
     if not os.path.isfile('/etc/fenrirscreenreader/settings/settings.conf'):
@@ -119,5 +129,4 @@ print('once as their user account and once as root to configure Pulseaudio.')
 print('Please install the following packages manually:')
 print('- Speech-dispatcher: for the default speech driver')
 print('- Espeak: as basic TTS engine')
-print('- BrlTTY: for Braille')
 print('- sox: is a player for the generic sound driver')

src/fenrir

@@ -2,20 +2,115 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-import os, sys, inspect
+import os
+import sys
+import inspect
+import argparse
+from daemonize import Daemonize
+
+# Get the fenrir installation path
 fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
 if not fenrirPath in sys.path:
     sys.path.append(fenrirPath)
 
 from fenrirscreenreader.core import fenrirManager
+from fenrirscreenreader import fenrirVersion
+
+def create_argument_parser():
+    """Create and return the argument parser for Fenrir"""
+    argumentParser = argparse.ArgumentParser(
+        description="Fenrir - A console screen reader for Linux",
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    argumentParser.add_argument(
+        '-v', '--version',
+        action='version',
+        version=f'Fenrir screen reader version {fenrirVersion.version}-{fenrirVersion.codeName}',
+        help='Show version information and exit'
+    )
+    argumentParser.add_argument(
+        '-f', '--foreground',
+        action='store_true',
+        help='Run Fenrir in the foreground (default: run as daemon)'
+    )
+    argumentParser.add_argument(
+        '-s', '--setting',
+        metavar='SETTING-FILE',
+        default='/etc/fenrir/settings/settings.conf',
+        help='Path to custom settings file'
+    )
+    argumentParser.add_argument(
+        '-o', '--options',
+        metavar='SECTION#SETTING=VALUE;..',
+        default='',
+        help='Override settings file options. Format: SECTION#SETTING=VALUE;... (case sensitive)'
+    )
+    argumentParser.add_argument(
+        '-d', '--debug',
+        action='store_true',
+        help='Enable debug mode'
+    )
+    argumentParser.add_argument(
+        '-p', '--print',
+        action='store_true',
+        help='Print debug messages to screen'
+    )
+    argumentParser.add_argument(
+        '-e', '--emulated-pty',
+        action='store_true',
+        help='Use PTY emulation with escape sequences for input (enables desktop/X/Wayland usage)'
+    )
+    argumentParser.add_argument(
+        '-E', '--emulated-evdev',
+        action='store_true',
+        help='Use PTY emulation with evdev for input (single instance)'
+    )
+    return argumentParser
+
+def validate_arguments(cliArgs):
+    """Validate command line arguments"""
+    if cliArgs.options:
+        for option in cliArgs.options.split(';'):
+            if option and ('#' not in option or '=' not in option):
+                return False, f"Invalid option format: {option}\nExpected format: SECTION#SETTING=VALUE"
+    
+    if cliArgs.emulated_pty and cliArgs.emulated_evdev:
+        return False, "Cannot use both --emulated-pty and --emulated-evdev simultaneously"
+    
+    return True, None
+
+def run_fenrir():
+    """Main function that runs Fenrir"""
+    fenrirApp = fenrirManager.fenrirManager(cliArgs)
+    fenrirApp.proceed()
+    del fenrirApp
 
 def main():
-    app = fenrirManager.fenrirManager()
-    app.proceed()
-    del app
+    global cliArgs
+    argumentParser = create_argument_parser()
+    cliArgs = argumentParser.parse_args()
+    
+    # Validate arguments
+    isValid, errorMsg = validate_arguments(cliArgs)
+    if not isValid:
+        argumentParser.error(errorMsg)
+        sys.exit(1)
+
+    if cliArgs.foreground or cliArgs.emulated_pty:
+        # Run directly in foreground
+        run_fenrir()
+    else:
+        # Run as daemon
+        pidFile = "/run/fenrir.pid"
+        daemonProcess = Daemonize(
+            app="fenrir",
+            pid=pidFile,
+            action=run_fenrir,
+            chdir=fenrirPath
+        )
+        daemonProcess.start()
 
 if __name__ == "__main__":
-    main()     
+    main()

src/fenrir-daemon

@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-import os, sys, inspect
-fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
-if not fenrirPath in sys.path:
-    sys.path.append(fenrirPath)
-
-from fenrirscreenreader.core import fenrirManager
-from daemonize import Daemonize
-
-pidFile = "/run/fenrir.pid"
-
-def main():
-    app = fenrirManager.fenrirManager()
-    app.proceed()
-    del app
-
-if __name__ == "__main__":
-    # for debug in foreground
-    #daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, foreground=True,chdir=fenrirPath)
-    daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=fenrirPath)
-    daemon.start()
-

src/fenrir-daemon-pypy

@@ -1,28 +0,0 @@
-#!/usr/bin/env pypy3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-import os, sys, inspect
-fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
-if not fenrirPath in sys.path:
-    sys.path.append(fenrirPath)
-
-from fenrirscreenreader.core import fenrirManager
-from daemonize import Daemonize
-
-pidFile = "/run/fenrir.pid"
-
-def main():
-    app = fenrirManager.fenrirManager()
-    app.proceed()
-    del app
-
-if __name__ == "__main__":
-    # for debug in foreground
-    #daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, foreground=True,chdir=os.path.dirname(os.path.realpath(fenrirVersion.__file__)))    
-    daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=fenrirPath)
-    daemon.start()
-

src/fenrir-pypy

@@ -1,21 +0,0 @@
-#!/usr/bin/env pypy3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-import os, sys, inspect
-fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
-if not fenrirPath in sys.path:
-    sys.path.append(fenrirPath)
-
-from fenrirscreenreader.core import fenrirManager
-
-def main():
-    app = fenrirManager.fenrirManager()
-    app.proceed()
-    del app
-
-if __name__ == "__main__":
-    main()     

src/fenrirscreenreader/brailleDriver/brlapiDriver.py

@@ -1,66 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.core.brailleDriver import brailleDriver
-
-class driver(brailleDriver):
-    def __init__(self):
-        brailleDriver.__init__(self)
-        self._brl = None
-
-    def initialize(self, environment):
-        self.env = environment
-        try:
-            import brlapi
-            self._brl = brlapi.Connection()
-            self._deviceSize = self._brl.displaySize
-        except Exception as e:
-            print(e)
-            self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)
-            return
-        self._isInitialized = True
-
-    def getDeviceSize(self):
-        if not self._isInitialized:
-            return (0,0)
-        if not self._deviceSize:
-            return (0,0)
-        return self._deviceSize
-
-    def flush(self):
-        if not self._isInitialized:
-            return
-        try:
-            self._brl.writeText('',0)
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('BRAILLE.flush '+str(e),debug.debugLevel.ERROR)
-    
-    def writeText(self,text):
-        if not self._isInitialized:
-            return
-        try:
-            self._brl.writeText(text)
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('BRAILLE.writeText '+str(e),debug.debugLevel.ERROR)
-
-    def connectDevice(self):
-        self._brl = brlapi.Connection()
-
-    def enterScreen(self, screen):
-        if not self._isInitialized:
-            return
-        self._brl.enterTtyMode(int(screen))
-
-    def leveScreen(self):
-        if not self._isInitialized:
-            return
-        self._brl.leaveTtyMode()
-
-    def shutdown(self):
-        if not self._isInitialized:
-            return
-        self.leveScreen()

src/fenrirscreenreader/brailleDriver/debugDriver.py

@@ -1,49 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.core.brailleDriver import brailleDriver
-
-class driver(brailleDriver):
-    def __init__(self):
-        brailleDriver.__init__(self)
-
-    def initialize(self, environment):
-        self.env = environment
-        self._isInitialized = True
-        self.deviceSize = (40,0)
-        print('Braille Debug Driver: Initialized')
-
-    def getDeviceSize(self):
-        if not self._isInitialized:
-            return (0,0)
-        print('Braille Debug Driver: getDeviceSize ' + str(self.deviceSize))
-        return self.deviceSize
-
-    def writeText(self,text):
-        if not self._isInitialized:
-            return
-        print('Braille Debug Driver: writeText:' + str(text))
-        print('Braille Debug Driver: -----------------------------------')
-
-    def connectDevice(self): 
-        print('Braille Debug Driver: connectDevice')
-
-    def enterScreen(self, screen):
-        if not self._isInitialized:
-            return
-        print('Braille Debug Driver: enterScreen')
-
-    def leveScreen(self):
-        if not self._isInitialized:
-            return
-        print('Braille Debug Driver: leveScreen')
-
-    def shutdown(self):
-        if self._isInitialized:
-            self.leveScreen()
-        self._isInitialized = False
-        print('Braille Debug Driver: Shutdown')

src/fenrirscreenreader/brailleDriver/dummyDriver.py

@@ -1,12 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.core.brailleDriver import brailleDriver
-
-class driver(brailleDriver):
-    def __init__(self):
-        brailleDriver.__init__(self)

src/fenrirscreenreader/commands/command_template.py

@@ -1,21 +1,21 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return 'No description found'         
-    def run(self):
-        pass
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return 'No description found'         
+    def run(self):
+        pass
+    def setCallback(self, callback):
+        pass

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

@@ -1,26 +1,26 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# 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
-# it is not useful to execute it
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-        # clipboard
-        self.env['runtime']['memoryManager'].addIndexList('clipboardHistory', self.env['runtime']['settingsManager'].getSettingAsInt('general', 'numberOfClipboards'))
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return 'No description found'         
-    def run(self):
-        pass
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# 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
+# it is not useful to execute it
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+        # clipboard
+        self.env['runtime']['memoryManager'].addIndexList('clipboardHistory', self.env['runtime']['settingsManager'].getSettingAsInt('general', 'numberOfClipboards'))
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return 'No description found'         
+    def run(self):
+        pass
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/announce_fenrir_version.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+from fenrirscreenreader import fenrirVersion
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _('Present the version of Fenrir currrrently in use.')
+    
+    def run(self):
+        try:
+            self.env['runtime']['outputManager'].presentText(f'Fenrir screen reader version {fenrirVersion.version}-{fenrirVersion.codeName}', interrupt=True)
+        except exception as e:
+            self.env['runtime']['outputManager'].presentText(_('Version information is unavailable.'), interrupt=True)
+            
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/attribute_cursor.py

@@ -1,30 +1,30 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import screen_utils
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _('Reads attributes of current cursor position')         
-    def run(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
-        try:
-            attributes = self.env['runtime']['attributeManager'].getAttributeByXY( cursorPos['x'], cursorPos['y'])
-        except Exception as e:
-            print(e)        
-        attributeFormatString = self.env['runtime']['settingsManager'].getSetting('general', 'attributeFormatString')
-        attributeFormatString = self.env['runtime']['attributeManager'].formatAttributes(attributes, attributeFormatString)
-        
-        self.env['runtime']['outputManager'].presentText(attributeFormatString, soundIcon='', interrupt=True)
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+from fenrirscreenreader.utils import screen_utils
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _('Reads attributes of current cursor position')         
+    def run(self):
+        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        try:
+            attributes = self.env['runtime']['attributeManager'].getAttributeByXY( cursorPos['x'], cursorPos['y'])
+        except Exception as e:
+            print(e)        
+        attributeFormatString = self.env['runtime']['settingsManager'].getSetting('general', 'attributeFormatString')
+        attributeFormatString = self.env['runtime']['attributeManager'].formatAttributes(attributes, attributeFormatString)
+        
+        self.env['runtime']['outputManager'].presentText(attributeFormatString, soundIcon='', interrupt=True)
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/bookmark_1.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_10.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_2.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_3.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_4.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_5.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_6.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_7.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_8.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/bookmark_9.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/braille_flush.py

@@ -1,21 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Clear the Braille device if it is displaying a message')
-    def run(self):
-        self.env['runtime']['outputManager'].clearFlushTime()
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/braille_pan_left.py

@@ -1,21 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _('Move braille view to the left.')         
-    def run(self):
-        panned = self.env['runtime']['outputManager'].setPanLeft()
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/braille_pan_right.py

@@ -1,21 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _('Move braille view to the right.')         
-    def run(self):
-        panned = self.env['runtime']['outputManager'].setPanRight()
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/braille_return_to_cursor.py

@@ -1,21 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _('Set the braille view back to cursor.')         
-    def run(self):
-        self.env['runtime']['outputManager'].removePanning()
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_1.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_10.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_2.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_3.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_4.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_5.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_6.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_7.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_8.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_bookmark_9.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/clear_clipboard.py

@@ -1,24 +1,24 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('clears the currently selected clipboard')     
-
-    def run(self):
-        self.env['runtime']['memoryManager'].clearCurrentIndexList('clipboardHistory')
-        self.env['runtime']['outputManager'].presentText(_('clipboard cleared'), interrupt=True)
-        return                
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('clears the currently selected clipboard')     
+
+    def run(self):
+        self.env['runtime']['memoryManager'].clearCurrentIndexList('clipboardHistory')
+        self.env['runtime']['outputManager'].presentText(_('clipboard cleared'), interrupt=True)
+        return                
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/clear_window_application.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 

src/fenrirscreenreader/commands/commands/curr_clipboard.py

@@ -1,27 +1,27 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('speaks the contents of the currently selected clipboard')       
-
-    def run(self):
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
-            return 
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
-        self.env['runtime']['outputManager'].presentText(clipboard , interrupt=True)
-               
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('speaks the contents of the currently selected clipboard')       
+
+    def run(self):
+        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+            return 
+        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+        self.env['runtime']['outputManager'].presentText(clipboard , interrupt=True)
+               
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/curr_screen.py

@@ -1,26 +1,26 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('reads the contents of the current screen')        
-
-    def run(self):
-        if self.env['screen']['newContentText'].isspace():
-            self.env['runtime']['outputManager'].presentText(_("screen is empty"), soundIcon='EmptyLine', interrupt=True)
-        else:    
-           self.env['runtime']['outputManager'].presentText(self.env['screen']['newContentText'],interrupt=True)
- 
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('reads the contents of the current screen')        
+
+    def run(self):
+        if self.env['screen']['newContentText'].isspace():
+            self.env['runtime']['outputManager'].presentText(_("screen is empty"), soundIcon='EmptyLine', interrupt=True)
+        else:    
+           self.env['runtime']['outputManager'].presentText(self.env['screen']['newContentText'],interrupt=True)
+ 
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/current_quick_menu_entry.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/current_quick_menu_value.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/cursor_column.py

@@ -1,25 +1,25 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _('Column number for cursor')       
-    def run(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
-        self.env['runtime']['outputManager'].presentText(str(cursorPos['x'] + 1) , interrupt=True)
-        self.env['runtime']['outputManager'].announceActiveCursor()
-        self.env['runtime']['outputManager'].presentText(' column number' , interrupt=False)
-        
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _('Column number for cursor')       
+    def run(self):
+        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        self.env['runtime']['outputManager'].presentText(str(cursorPos['x'] + 1) , interrupt=True)
+        self.env['runtime']['outputManager'].announceActiveCursor()
+        self.env['runtime']['outputManager'].presentText(' column number' , interrupt=False)
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/cursor_lineno.py

@@ -1,25 +1,25 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _('Line number for cursor')         
-    def run(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
-        self.env['runtime']['outputManager'].presentText(str(cursorPos['y'] + 1), interrupt=True)
-        self.env['runtime']['outputManager'].announceActiveCursor()
-        self.env['runtime']['outputManager'].presentText(' line number' , interrupt=False)
-        
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _('Line number for cursor')         
+    def run(self):
+        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        self.env['runtime']['outputManager'].presentText(str(cursorPos['y'] + 1), interrupt=True)
+        self.env['runtime']['outputManager'].announceActiveCursor()
+        self.env['runtime']['outputManager'].presentText(' line number' , interrupt=False)
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/cursor_position.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/cursor_read_line_to_cursor.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/date.py

@@ -1,30 +1,30 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import datetime
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('presents the date')        
-    
-    def run(self):
-        dateFormat = self.env['runtime']['settingsManager'].getSetting('general', 'dateFormat')
-
-        # get the time formatted
-        dateString = datetime.datetime.strftime(datetime.datetime.now(), dateFormat)
-
-        # present the time via speak and braile, there is no soundicon, interrupt the current speech
-        self.env['runtime']['outputManager'].presentText(dateString , soundIcon='', interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import datetime
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('presents the date')        
+    
+    def run(self):
+        dateFormat = self.env['runtime']['settingsManager'].getSetting('general', 'dateFormat')
+
+        # get the time formatted
+        dateString = datetime.datetime.strftime(datetime.datetime.now(), dateFormat)
+
+        # present the time via speak and braile, there is no soundicon, interrupt the current speech
+        self.env['runtime']['outputManager'].presentText(dateString , soundIcon='', interrupt=True)
+
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/dec_alsa_volume.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/dec_sound_volume.py

@@ -1,33 +1,33 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    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
-
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import math
+
+class command():
+    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
+

src/fenrirscreenreader/commands/commands/dec_speech_pitch.py

@@ -1,29 +1,29 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    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
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import math
+
+class command():
+    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

src/fenrirscreenreader/commands/commands/dec_speech_rate.py

@@ -1,30 +1,30 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    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
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import math
+
+class command():
+    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

src/fenrirscreenreader/commands/commands/dec_speech_volume.py

@@ -1,31 +1,31 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    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
-
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import math
+
+class command():
+    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
+

src/fenrirscreenreader/commands/commands/exit_review.py

@@ -1,28 +1,28 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('exits review mode')        
-    
-    def run(self):
-        if not self.env['runtime']['cursorManager'].isReviewMode():
-            self.env['runtime']['outputManager'].presentText(_("Not in Review Mode"), interrupt=True)
-            return  
-
-        self.env['runtime']['cursorManager'].clearReviewCursor()
-        self.env['runtime']['outputManager'].presentText(_("Exiting Review Mode"), interrupt=True)
-   
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('exits review mode')        
+    
+    def run(self):
+        if not self.env['runtime']['cursorManager'].isReviewMode():
+            self.env['runtime']['outputManager'].presentText(_("Not in Review Mode"), interrupt=True)
+            return  
+
+        self.env['runtime']['cursorManager'].clearReviewCursor()
+        self.env['runtime']['outputManager'].presentText(_("Exiting Review Mode"), interrupt=True)
+   
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/export_clipboard_to_file.py

@@ -1,39 +1,39 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import os
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment, scriptPath=''):
-        self.env = environment
-
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _('export the current fenrir clipboard to a file')
-    def run(self):  
-        clipboardFilePath = self.env['runtime']['settingsManager'].getSetting('general', 'clipboardExportPath')
-        clipboardFilePath = clipboardFilePath.replace('$user',self.env['general']['currUser'])        
-        clipboardFilePath = clipboardFilePath.replace('$USER',self.env['general']['currUser'])        
-        clipboardFilePath = clipboardFilePath.replace('$User',self.env['general']['currUser'])                        
-        clipboardFile = open(clipboardFilePath,'w')        
-        try:
-            if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
-                self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
-                return 
-            clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')                             
-            clipboardFile.write(clipboard)
-            clipboardFile.close()
-            os.chmod(clipboardFilePath, 0o666)
-            self.env['runtime']['outputManager'].presentText(_('clipboard exported to file'), interrupt=True)            
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('export_clipboard_to_file:run: Filepath:'+ clipboardFile +' trace:' + str(e),debug.debugLevel.ERROR)                                
-        
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import os
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment, scriptPath=''):
+        self.env = environment
+
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _('export the current fenrir clipboard to a file')
+    def run(self):  
+        clipboardFilePath = self.env['runtime']['settingsManager'].getSetting('general', 'clipboardExportPath')
+        clipboardFilePath = clipboardFilePath.replace('$user',self.env['general']['currUser'])        
+        clipboardFilePath = clipboardFilePath.replace('$USER',self.env['general']['currUser'])        
+        clipboardFilePath = clipboardFilePath.replace('$User',self.env['general']['currUser'])                        
+        clipboardFile = open(clipboardFilePath,'w')        
+        try:
+            if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+                self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+                return 
+            clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')                             
+            clipboardFile.write(clipboard)
+            clipboardFile.close()
+            os.chmod(clipboardFilePath, 0o666)
+            self.env['runtime']['outputManager'].presentText(_('clipboard exported to file'), interrupt=True)            
+        except Exception as e:
+            self.env['runtime']['debug'].writeDebugOut('export_clipboard_to_file:run: Filepath:'+ clipboardFile +' trace:' + str(e),debug.debugLevel.ERROR)                                
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py

@@ -1,77 +1,69 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import subprocess, os
-from subprocess import Popen, PIPE
-import _thread
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _('Export current fenrir clipboard to X or GUI clipboard')
-    def run(self):                       
-       _thread.start_new_thread(self._threadRun , ())
-    def _threadRun(self):
-        try:
-            if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
-                self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
-                return
-                                                                                                                                                    
-            clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
-            user = self.env['general']['currUser']
-        
-            # First try to find xclip in common locations
-            xclip_paths = [
-                '/usr/bin/xclip',
-                '/bin/xclip',
-                '/usr/local/bin/xclip'
-            ]
-        
-            xclip_path = None
-            for path in xclip_paths:
-                if os.path.isfile(path) and os.access(path, os.X_OK):
-                    xclip_path = path
-                    break
-                
-            if not xclip_path:
-                self.env['runtime']['outputManager'].presentText(
-                    'xclip not found in common locations', 
-                    interrupt=True
-                )
-                return
-                                                                                                                                                    
-            for display in range(10):
-                p = Popen(
-                    ['su', user, '-p', '-c', f"{xclip_path} -d :{display} -selection clipboard"],
-                    stdin=PIPE, stdout=PIPE, stderr=PIPE, preexec_fn=os.setpgrp
-                )
-                stdout, stderr = p.communicate(input=clipboard.encode('utf-8'))
-                                                                                                                                                    
-                self.env['runtime']['outputManager'].interruptOutput()
-                                                                                                                                                    
-                stderr = stderr.decode('utf-8')
-                stdout = stdout.decode('utf-8')
-                                                                                                                                                    
-                if stderr == '':
-                    break
-                                                                                                                                                    
-            if stderr != '':
-                self.env['runtime']['outputManager'].presentText(stderr, soundIcon='', interrupt=False)
-            else:
-                self.env['runtime']['outputManager'].presentText('exported to the X session.', interrupt=True)
-                                                                                                                                                    
-        except Exception as e:
-            self.env['runtime']['outputManager'].presentText(str(e), soundIcon='', interrupt=False)
-
-                                                                                                                                                                
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import os
+import _thread
+import pyperclip
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment, scriptPath=''):
+        self.env = environment
+        self.scriptPath = scriptPath
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _('Export current fenrir clipboard to X or GUI clipboard')
+    def run(self):                       
+       _thread.start_new_thread(self._threadRun , ())
+    def _threadRun(self):
+        try:
+            # Check if clipboard is empty
+            if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+                self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+                return
+            
+            # Get current clipboard content
+            clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+            
+            # Remember original display environment variable if it exists
+            originalDisplay = os.environ.get('DISPLAY', '')
+            success = False
+            
+            # Try different display options
+            for i in range(10):
+                display = f":{i}"
+                try:
+                    # Set display environment variable
+                    os.environ['DISPLAY'] = display
+                    # Attempt to set clipboard content
+                    pyperclip.copy(clipboard)
+                    # If we get here without exception, we found a working display
+                    success = True
+                    break
+                except Exception:
+                    # Failed for this display, try next one
+                    continue
+            
+            # Restore original display setting
+            if originalDisplay:
+                os.environ['DISPLAY'] = originalDisplay
+            else:
+                os.environ.pop('DISPLAY', None)
+            
+            # Notify the user of the result
+            if success:
+                self.env['runtime']['outputManager'].presentText(_('exported to the X session.'), interrupt=True)
+            else:
+                self.env['runtime']['outputManager'].presentText(_('failed to export to X clipboard. No available display found.'), interrupt=True)
+                
+        except Exception as e:
+            self.env['runtime']['outputManager'].presentText(str(e), soundIcon='', interrupt=False)
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/first_clipboard.py

@@ -1,28 +1,28 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('selects the first clipboard')        
-    
-    def run(self):
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
-            return
-        self.env['runtime']['memoryManager'].setFirstIndex('clipboardHistory')     
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
-        self.env['runtime']['outputManager'].presentText(clipboard, interrupt=True)
-           
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('selects the first clipboard')        
+    
+    def run(self):
+        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+            return
+        self.env['runtime']['memoryManager'].setFirstIndex('clipboardHistory')     
+        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+        self.env['runtime']['outputManager'].presentText(clipboard, interrupt=True)
+           
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/forward_keypress.py

@@ -1,24 +1,24 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('sends the following keypress to the terminal or application')        
-    
-    def run(self):
-        self.env['input']['keyForeward'] = 3
-        self.env['runtime']['outputManager'].presentText(_('Forward next keypress'), interrupt=True)
-
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('sends the following keypress to the terminal or application')        
+    
+    def run(self):
+        self.env['input']['keyForeward'] = 3
+        self.env['runtime']['outputManager'].presentText(_('Forward next keypress'), interrupt=True)
+
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py

@@ -1,54 +1,62 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import subprocess, os
-from subprocess import Popen, PIPE
-import _thread
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment, scriptPath=''):
-        self.env = environment
-        self.scriptPath = scriptPath
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _("imports the graphical clipboard to Fenrir's clipboard")
-    def run(self):                       
-       _thread.start_new_thread(self._threadRun , ())
-    def _threadRun(self):
-        try:
-            # Find xclip path
-            xclip_paths = ['/usr/bin/xclip', '/bin/xclip', '/usr/local/bin/xclip']
-            xclip_path = None
-            for path in xclip_paths:
-                if os.path.isfile(path) and os.access(path, os.X_OK):
-                    xclip_path = path
-                    break
-            if not xclip_path:
-                self.env['runtime']['outputManager'].presentText('xclip not found in common locations', interrupt=True)
-                return
-            xClipboard = ''
-            for display in range(10):
-                p = Popen('su ' + self.env['general']['currUser'] + ' -p -c  "' + xclip_path + ' -d :' + str(display) + ' -o"', stdout=PIPE, stderr=PIPE, shell=True)
-                stdout, stderr = p.communicate()
-                self.env['runtime']['outputManager'].interruptOutput()
-                stderr = stderr.decode('utf-8')
-                xClipboard = stdout.decode('utf-8')
-                if (stderr == ''):
-                    break      
-            if stderr != '':
-                self.env['runtime']['outputManager'].presentText(stderr , soundIcon='', interrupt=False)
-            else:
-                self.env['runtime']['memoryManager'].addValueToFirstIndex('clipboardHistory', xClipboard)
-                self.env['runtime']['outputManager'].presentText('Import to Clipboard', soundIcon='CopyToClipboard', interrupt=True)
-                self.env['runtime']['outputManager'].presentText(xClipboard, soundIcon='', interrupt=False)               
-        except Exception as e:
-            self.env['runtime']['outputManager'].presentText(e , soundIcon='', interrupt=False)
-        
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import _thread
+import pyperclip
+import os
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment, scriptPath=''):
+        self.env = environment
+        self.scriptPath = scriptPath
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _("imports the graphical clipboard to Fenrir's clipboard")
+    def run(self):                       
+       _thread.start_new_thread(self._threadRun , ())
+    def _threadRun(self):
+        try:
+            # Remember original display environment variable if it exists
+            originalDisplay = os.environ.get('DISPLAY', '')
+            clipboardContent = None
+            
+            # Try different display options
+            for i in range(10):
+                display = f":{i}"
+                try:
+                    # Set display environment variable
+                    os.environ['DISPLAY'] = display
+                    # Attempt to get clipboard content
+                    clipboardContent = pyperclip.paste()
+                    # If we get here without exception, we found a working display
+                    if clipboardContent:
+                        break
+                except Exception:
+                    # Failed for this display, try next one
+                    continue
+            
+            # Restore original display setting
+            if originalDisplay:
+                os.environ['DISPLAY'] = originalDisplay
+            else:
+                os.environ.pop('DISPLAY', None)
+            
+            # Process the clipboard content if we found any
+            if clipboardContent and isinstance(clipboardContent, str):
+                self.env['runtime']['memoryManager'].addValueToFirstIndex('clipboardHistory', clipboardContent)
+                self.env['runtime']['outputManager'].presentText('Import to Clipboard', soundIcon='CopyToClipboard', interrupt=True)
+                self.env['runtime']['outputManager'].presentText(clipboardContent, soundIcon='', interrupt=False)
+            else:
+                self.env['runtime']['outputManager'].presentText('No text found in clipboard or no accessible display', interrupt=True)
+        except Exception as e:
+            self.env['runtime']['outputManager'].presentText(str(e), soundIcon='', interrupt=False)
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/inc_alsa_volume.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/inc_sound_volume.py

@@ -1,32 +1,32 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    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
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import math
+
+class command():
+    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

src/fenrirscreenreader/commands/commands/inc_speech_pitch.py

@@ -1,30 +1,30 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    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
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import math
+
+class command():
+    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

src/fenrirscreenreader/commands/commands/inc_speech_rate.py

@@ -1,30 +1,30 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    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
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import math
+
+class command():
+    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

src/fenrirscreenreader/commands/commands/inc_speech_volume.py

@@ -1,30 +1,30 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    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
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import math
+
+class command():
+    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

src/fenrirscreenreader/commands/commands/indent_curr_line.py

@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader

src/fenrirscreenreader/commands/commands/last_clipboard.py

@@ -1,28 +1,28 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('selects the last clipboard')        
-    
-    def run(self):
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
-            return
-        self.env['runtime']['memoryManager'].setLastIndex('clipboardHistory')     
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
-        self.env['runtime']['outputManager'].presentText(clipboard, interrupt=True)
-            
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('selects the last clipboard')        
+    
+    def run(self):
+        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+            return
+        self.env['runtime']['memoryManager'].setLastIndex('clipboardHistory')     
+        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+        self.env['runtime']['outputManager'].presentText(clipboard, interrupt=True)
+            
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/last_incoming.py

@@ -1,23 +1,23 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Presents the text which was last received')        
-    
-    def run(self):
-        self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=True)
-  
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('Presents the text which was last received')        
+    
+    def run(self):
+        self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=True)
+  
+    def setCallback(self, callback):
+        pass