make punctuation initial working

src/fenrir-package/core/outputManager.py

@@ -20,7 +20,7 @@ class outputManager():
         self.env['runtime']['settingsManager'].shutdownDriver('soundDriver')
         self.env['runtime']['settingsManager'].shutdownDriver('speechDriver')
 
-    def presentText(self, text, interrupt=True, soundIcon = ''):
+    def presentText(self, text, interrupt=True, soundIcon = '', ignorePunctuation=False):
         self.env['runtime']['debug'].writeDebugOut("presentText:\nsoundIcon:'"+soundIcon+"'\nText:\n" + text ,debug.debugLevel.INFO)
         if self.playSoundIcon(soundIcon, interrupt):
             self.env['runtime']['debug'].writeDebugOut("soundIcon found" ,debug.debugLevel.INFO)            
@@ -28,7 +28,7 @@ class outputManager():
         self.speakText(text, interrupt)
         self.brailleText(text, interrupt)
 
-    def speakText(self, text, interrupt=True):
+    def speakText(self, text, interrupt=True, ignorePunctuation=False):
         if not self.env['runtime']['settingsManager'].getSettingAsBool('speech', 'enabled'):
             self.env['runtime']['debug'].writeDebugOut("Speech disabled in outputManager.speakText",debug.debugLevel.INFO)
             return
@@ -74,8 +74,10 @@ class outputManager():
             self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)            
         
         try:
+            text = self.env['runtime']['punctuationManager'].proceedPunctuation(text,ignorePunctuation) 
             self.env['runtime']['speechDriver'].speak(text)
         except Exception as e:
+            print(e)
             self.env['runtime']['debug'].writeDebugOut("\"speak\" in outputManager.speakText ",debug.debugLevel.ERROR)
             self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)            
 

src/fenrir-package/core/punctuationManager.py

@@ -4,6 +4,7 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
+import string
 from core import debug
 
 class punctuationManager():
@@ -12,7 +13,7 @@ class punctuationManager():
     def initialize(self, environment):
         self.env = environment
         self.punctuation = {
-        'currLevel':'1',
+        'currLevel':'3',
         'levels':{
           '1':',',
           '2':'.',
@@ -39,16 +40,18 @@ class punctuationManager():
         return resultText
     def usePunctuationDict(self, text, punctuationDict, punctuation):
         resultText = str(text)
-        if punctuationDict and punctuation != '':
+
+        if punctuationDict and punctuation and punctuation != '':
             for key,item in punctuationDict.items():
                 if key in punctuation:
                     resultText = resultText.replace(str(key),' ' +str(item) +' ')
+
         return resultText
     
-    def proceedPunctuation(self, text, ignoreLevel=False):
+    def proceedPunctuation(self, text, ignorePunctuation=False):
         resultText = self.useCustomDict(text, self.punctuation['customDict'])
         currPunctLevel = ''
-        if not ignoreLevel:
+        if not ignorePunctuation and self.punctuation['currLevel'] in self.punctuation['levels']:
             currPunctLevel = self.punctuation['levels'][self.punctuation['currLevel']]
         else:
             currPunctLevel = string.punctuation