From d3f46fe3cff0bfbbd1932267caf2e609ad4f71b3 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Thu, 20 Oct 2016 10:11:29 +0200 Subject: [PATCH] Update punctuationManager.py --- src/fenrir/core/punctuationManager.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/fenrir/core/punctuationManager.py b/src/fenrir/core/punctuationManager.py index 25006e4b..0c0cf092 100644 --- a/src/fenrir/core/punctuationManager.py +++ b/src/fenrir/core/punctuationManager.py @@ -15,9 +15,11 @@ class punctuationManager(): self.allPunctNone = dict.fromkeys(map(ord, string.punctuation +"§"), ' ') # replace with None: # dot, comma, grave, apostrophe - for char in [ord('.'),ord(','),ord('`'),ord("'")]: - self.allPunctNone[char] = None - + #for char in [ord('`'),ord("'")]: + # self.allPunctNone[char] = None + # dont restore the following (for announce correct pause) + for char in [ord('.'), ord(','), ord(';'), ord(':'), ord('?'), ord('!'), ord('-')]: + self.allPunctNone[char] = chr(char) def shutdown(self): pass def removeUnused(self, text, currLevel = ''): @@ -60,9 +62,9 @@ class punctuationManager(): if not ignorePunctuation and self.env['runtime']['settingsManager'].getSetting('general', 'punctuationLevel').lower() in self.env['punctuation']['LEVELDICT']: currPunctLevel = self.env['punctuation']['LEVELDICT'][self.env['runtime']['settingsManager'].getSetting('general', 'punctuationLevel').lower()] else: - currPunctLevel = string.punctuation + currPunctLevel = string.punctuation +'§' resultText = self.usePunctuationDict(resultText, self.env['punctuation']['PUNCTDICT'], currPunctLevel) - #resultText = self.removeUnused(resultText, currPunctLevel) + resultText = self.removeUnused(resultText, currPunctLevel) return resultText def cyclePunctuation(self):