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

Merge branch 'regexpunct'

Browse Source
This commit is contained in:
Chrys 2019-10-22 00:28:02 +02:00
commit a05a85ee34
7 changed files with 146 additions and 51 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

40
config/punctuation/default.conf
View File

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

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

@ -50,7 +50,7 @@ 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 "',.;:?!":