storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into retrygrab

Browse Source
This commit is contained in:
Chrys
2019-10-22 00:28:17 +02:00
parent ce9ffaa107 a05a85ee34
commit aa5bb94237
7 changed files with 158 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/fenrirscreenreader/core/punctuationManager.py
View File

@ -33,15 +33,16 @@ class punctuationManager():
del currAllPunctNone[ord(char)]
except:
pass
return text.translate(currAllPunctNone)
return text.translate(currAllPunctNone)
def useCustomDict(self, text, customDict, seperator=''):
resultText = str(text)
if customDict:
for key,item in customDict.items():
resultText = resultText.replace(str(key),seperator + str(item) + seperator)
try:
resultText = re.sub(str(key), seperator + str(item) + seperator, resultText)
except:
resultText = resultText.replace(str(key),seperator + str(item) + seperator)
return resultText
def usePunctuationDict(self, text, punctuationDict, punctuation):
resultText = str(text)
@ -49,11 +50,11 @@ class punctuationManager():
if ' ' in punctuation:
resultText = resultText.replace(' ',' ' + punctuationDict[' '] + ' ')
for key,item in punctuationDict.items():
if key in punctuation and key not in ' ':
if (punctuation != '' and key in punctuation) and key not in ' ':
if self.env['runtime']['settingsManager'].getSetting('general', 'respectPunctuationPause') and \
len(key) == 1 and \
key in "',.;:?!":
resultText = resultText.replace(str(key),' ' +str(item) + str(key) + ' ')
resultText = resultText.replace(str(key),' ' +str(item) + str(key) + ' ')
else:
resultText = resultText.replace(str(key),' ' +str(item) + ' ')
return resultText