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
commit aa5bb94237
7 changed files with 158 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
config/punctuation/de.conf
View File

@ -44,10 +44,29 @@ _:===:Lienie unten
=:===:Istgleich =:===:Istgleich
[customDict] [customDict]
[emoticonDict] [emoticonDict]
:):===:Grins # This dictionary uses regexp, so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
;):===:Zwinker [\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
XD:===:loool [\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
:D:===:Lach [\s*|'|"][\s*|'|"]:-/:===:confused
<{-.-}>:===:Raves [\s*|'|"][\s*|'|"]-\.-:===:bugged
[\s*|'|"][\s*|'|"]>\.<:===:laughing
[\s*|'|"][\s*|'|"]8-X:===:skull
[\s*|'|"][\s*|'|"]>:\):===:evil smile
[\s*|'|"][\s*|'|"]>:-\):===:evil smile
[\s*|'|"][\s*|'|"]\\o/:===:Hurray
[\s*|'|"][\s*|'|"]:/:===:confused
[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
[\s*|'|"]:D[\s*|'|"]:===:laugh
[\s*|'|"];\)[\s*|'|"]:===:wink
[\s*|'|"]XD[\s*|'|"]:===:LOL
[\s*|'|"]:-\)[\s*|'|"]:===:smile
[\s*|'|"]:\)[\s*|'|"]:===:smile
[\s*|'|"]->[\s*|'|"]:===:arrow right
# example for arrow left
#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
# or
#([ |^])<-([ ,.!?$]):===:arrow left\2
[\s*|'|"]<-[\s*|'|"]:===:arrow left
[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile

47
config/punctuation/default.conf
View File

@ -44,26 +44,31 @@ _:===:line
=:===:equals =:===:equals
[customDict] [customDict]
# This dictionary uses regexp, so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
[emoticonDict] [emoticonDict]
<{-.-}>:===:Raves # This dictionary uses regexp, so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
8-):===:smile with sunglasses [\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
:-/:===:confused [\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-.-:===:bugged [\s*|'|"][\s*|'|"]:-/:===:confused
>.<:===:laughing [\s*|'|"][\s*|'|"]-\.-:===:bugged
8-X:===:skull [\s*|'|"][\s*|'|"]>\.<:===:laughing
>:):===:evil smile [\s*|'|"][\s*|'|"]8-X:===:skull
>:-):===:evil smile [\s*|'|"][\s*|'|"]>:\):===:evil smile
\o/:===:Hurray [\s*|'|"][\s*|'|"]>:-\):===:evil smile
:/:===:confused [\s*|'|"][\s*|'|"]\\o/:===:Hurray
8):===:smile with sunglasses [\s*|'|"][\s*|'|"]:/:===:confused
:D:===:laugh [\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
;):===:wink [\s*|'|"]:D[\s*|'|"]:===:laugh
XD:===:LOL [\s*|'|"];\)[\s*|'|"]:===:wink
:-):===:smile [\s*|'|"]XD[\s*|'|"]:===:LOL
:):===:smile [\s*|'|"]:-\)[\s*|'|"]:===:smile
->:===:arrow right [\s*|'|"]:\)[\s*|'|"]:===:smile
<-:===:arrow left [\s*|'|"]->[\s*|'|"]:===:arrow right
oO:===:WTF? # example for arrow left
Oo:===:WTF? #(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
^^:===:enjoy smile # or
#([ |^])<-([ ,.!?$]):===:arrow left\2
[\s*|'|"]<-[\s*|'|"]:===:arrow left
[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile

31
config/punctuation/en.conf
View File

@ -44,10 +44,29 @@ _:===:line
=:===:equals =:===:equals
[customDict] [customDict]
[emoticonDict] [emoticonDict]
:):===:smile # This dictionary uses regexp, so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
;):===:twinker [\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
XD:===:loool [\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
:D:===:lought [\s*|'|"][\s*|'|"]:-/:===:confused
<{-.-}>:===:Raves [\s*|'|"][\s*|'|"]-\.-:===:bugged
[\s*|'|"][\s*|'|"]>\.<:===:laughing
[\s*|'|"][\s*|'|"]8-X:===:skull
[\s*|'|"][\s*|'|"]>:\):===:evil smile
[\s*|'|"][\s*|'|"]>:-\):===:evil smile
[\s*|'|"][\s*|'|"]\\o/:===:Hurray
[\s*|'|"][\s*|'|"]:/:===:confused
[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
[\s*|'|"]:D[\s*|'|"]:===:laugh
[\s*|'|"];\)[\s*|'|"]:===:wink
[\s*|'|"]XD[\s*|'|"]:===:LOL
[\s*|'|"]:-\)[\s*|'|"]:===:smile
[\s*|'|"]:\)[\s*|'|"]:===:smile
[\s*|'|"]->[\s*|'|"]:===:arrow right
# example for arrow left
#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
# or
#([ |^])<-([ ,.!?$]):===:arrow left\2
[\s*|'|"]<-[\s*|'|"]:===:arrow left
[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile

31
config/punctuation/es.conf
View File

@ -44,10 +44,29 @@ _:===:subrayado
=:===:igual =:===:igual
[customDict] [customDict]
[emoticonDict] [emoticonDict]
:):===:sonrisa # This dictionary uses regexp, so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
;):===:twinker [\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
XD:===:loool [\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
:D:===:lought [\s*|'|"][\s*|'|"]:-/:===:confused
<{-.-}>:===:Raves [\s*|'|"][\s*|'|"]-\.-:===:bugged
[\s*|'|"][\s*|'|"]>\.<:===:laughing
[\s*|'|"][\s*|'|"]8-X:===:skull
[\s*|'|"][\s*|'|"]>:\):===:evil smile
[\s*|'|"][\s*|'|"]>:-\):===:evil smile
[\s*|'|"][\s*|'|"]\\o/:===:Hurray
[\s*|'|"][\s*|'|"]:/:===:confused
[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
[\s*|'|"]:D[\s*|'|"]:===:laugh
[\s*|'|"];\)[\s*|'|"]:===:wink
[\s*|'|"]XD[\s*|'|"]:===:LOL
[\s*|'|"]:-\)[\s*|'|"]:===:smile
[\s*|'|"]:\)[\s*|'|"]:===:smile
[\s*|'|"]->[\s*|'|"]:===:arrow right
# example for arrow left
#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
# or
#([ |^])<-([ ,.!?$]):===:arrow left\2
[\s*|'|"]<-[\s*|'|"]:===:arrow left
[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile

31
config/punctuation/fr.conf
View File

@ -44,10 +44,29 @@ _:===:souligné
=:===:égale à =:===:égale à
[customDict] [customDict]
[emoticonDict] [emoticonDict]
:):===:sourire # This dictionary uses regexp, so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
;):===:clin d'oeil [\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
XD:===:explosé de rire [\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
:D:===:rire [\s*|'|"][\s*|'|"]:-/:===:confused
<{-.-}>:===:Raves [\s*|'|"][\s*|'|"]-\.-:===:bugged
[\s*|'|"][\s*|'|"]>\.<:===:laughing
[\s*|'|"][\s*|'|"]8-X:===:skull
[\s*|'|"][\s*|'|"]>:\):===:evil smile
[\s*|'|"][\s*|'|"]>:-\):===:evil smile
[\s*|'|"][\s*|'|"]\\o/:===:Hurray
[\s*|'|"][\s*|'|"]:/:===:confused
[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
[\s*|'|"]:D[\s*|'|"]:===:laugh
[\s*|'|"];\)[\s*|'|"]:===:wink
[\s*|'|"]XD[\s*|'|"]:===:LOL
[\s*|'|"]:-\)[\s*|'|"]:===:smile
[\s*|'|"]:\)[\s*|'|"]:===:smile
[\s*|'|"]->[\s*|'|"]:===:arrow right
# example for arrow left
#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
# or
#([ |^])<-([ ,.!?$]):===:arrow left\2
[\s*|'|"]<-[\s*|'|"]:===:arrow left
[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile

31
config/punctuation/pl.conf
View File

@ -44,10 +44,29 @@ _:===:podkreślnik
=:===:równa się =:===:równa się
[customDict] [customDict]
[emoticonDict] [emoticonDict]
:):===:smile # This dictionary uses regexp, so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
;):===:twinker [\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
XD:===:loool [\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
:D:===:lought [\s*|'|"][\s*|'|"]:-/:===:confused
<{-.-}>:===:Raves [\s*|'|"][\s*|'|"]-\.-:===:bugged
[\s*|'|"][\s*|'|"]>\.<:===:laughing
[\s*|'|"][\s*|'|"]8-X:===:skull
[\s*|'|"][\s*|'|"]>:\):===:evil smile
[\s*|'|"][\s*|'|"]>:-\):===:evil smile
[\s*|'|"][\s*|'|"]\\o/:===:Hurray
[\s*|'|"][\s*|'|"]:/:===:confused
[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
[\s*|'|"]:D[\s*|'|"]:===:laugh
[\s*|'|"];\)[\s*|'|"]:===:wink
[\s*|'|"]XD[\s*|'|"]:===:LOL
[\s*|'|"]:-\)[\s*|'|"]:===:smile
[\s*|'|"]:\)[\s*|'|"]:===:smile
[\s*|'|"]->[\s*|'|"]:===:arrow right
# example for arrow left
#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
# or
#([ |^])<-([ ,.!?$]):===:arrow left\2
[\s*|'|"]<-[\s*|'|"]:===:arrow left
[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile

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

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