Additional notes and suffixes fix

This commit is contained in:
STEPHANVS 2021-07-07 10:56:19 +02:00
parent 0fc81b8efb
commit b5d2908c15
No known key found for this signature in database
GPG Key ID: 4EFE47E471FD62A9

View File

@ -44,11 +44,11 @@ from openlp.core.lib.formattingtags import FormattingTags
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
ENGLISH_NOTES = '[CDEFGAB]?' ENGLISH_NOTES = '(C|D|E|F|G|A|B|N.C.)?'
GERMAN_NOTES = '[CDEFGABH]?' GERMAN_NOTES = '(C|D|E|F|G|A|B|H|N.C.)?'
NEOLATIN_NOTES = '(Do|Re|Mi|Fa|Sol|La|Si)?' NEOLATIN_NOTES = '(Do|Re|Mi|Fa|Sol|La|Si|N.C.)?'
CHORD_PREFIXES = '(=|\\(|\\|)*?' CHORD_PREFIXES = '(=|\\(|\\|)*?'
CHORD_SUFFIXES = '(b|bb|#|##|x|-|m|maj|min|sus|dim|add|0|1|2|3|4|5|6|7|8|9|\\))*?' CHORD_SUFFIXES = '(b|#|x|+|-|M|m|Maj|maj|min|sus|dim|add|aug|dom|0|1|2|3|4|5|6|7|8|9|\\(|\\)|no|omit)*?'
SLIM_CHARS = 'fiíIÍjlĺľrtť.,;/ ()|"\'!:\\' SLIM_CHARS = 'fiíIÍjlĺľrtť.,;/ ()|"\'!:\\'
CHORD_TEMPLATE = '<span class="chordline">{chord}</span>' CHORD_TEMPLATE = '<span class="chordline">{chord}</span>'
FIRST_CHORD_TEMPLATE = '<span class="chordline">{chord}</span>' FIRST_CHORD_TEMPLATE = '<span class="chordline">{chord}</span>'