From b5d2908c15d3b4026b775270bbc655d6fcaa8f5d Mon Sep 17 00:00:00 2001 From: STEPHANVS Date: Wed, 7 Jul 2021 10:56:19 +0200 Subject: [PATCH] Additional notes and suffixes fix --- openlp/core/display/render.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/display/render.py b/openlp/core/display/render.py index 9eb7abbe6..eb19a17ae 100644 --- a/openlp/core/display/render.py +++ b/openlp/core/display/render.py @@ -44,11 +44,11 @@ from openlp.core.lib.formattingtags import FormattingTags log = logging.getLogger(__name__) -ENGLISH_NOTES = '[CDEFGAB]?' -GERMAN_NOTES = '[CDEFGABH]?' -NEOLATIN_NOTES = '(Do|Re|Mi|Fa|Sol|La|Si)?' +ENGLISH_NOTES = '(C|D|E|F|G|A|B|N.C.)?' +GERMAN_NOTES = '(C|D|E|F|G|A|B|H|N.C.)?' +NEOLATIN_NOTES = '(Do|Re|Mi|Fa|Sol|La|Si|N.C.)?' 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ť.,;/ ()|"\'!:\\' CHORD_TEMPLATE = '{chord}' FIRST_CHORD_TEMPLATE = '{chord}'