From 590b097c00527c767e065bf067dd164dddcaef1c Mon Sep 17 00:00:00 2001 From: "Prof. Dr. Matthias Jung DL9MJ" Date: Sun, 25 May 2025 23:43:55 +0200 Subject: [PATCH 1/2] fix: correct morse span code --- renderer/morse.py | 2 +- test/test_morse.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/renderer/morse.py b/renderer/morse.py index cc0cd02..72eabe6 100644 --- a/renderer/morse.py +++ b/renderer/morse.py @@ -87,4 +87,4 @@ class Morse(SpanToken): return result parse_inner = False - pattern = re.compile(r'\[morse:\s*(.+)\]') + pattern = re.compile(r'\[morse:\s*([^\]]+)\]') diff --git a/test/test_morse.py b/test/test_morse.py index c568852..9985209 100644 --- a/test/test_morse.py +++ b/test/test_morse.py @@ -9,6 +9,7 @@ from test.util import paragraph def test_morse_html(): assertions = { '[morse:a]': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2]]), + '[morse:a] abc [morse:a]': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2]])+ ' abc ' + FiftyOhmHtmlRenderer.render_morse_helper([[1, 2]]), '[morse: a]': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2]]), '[morse: aaa]': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2], [1, 2], [1, 2]]), '[morse: a a]': FiftyOhmHtmlRenderer.render_morse_helper([[1, 2], [3], [1, 2]]), From fee30966a8d10457cce08817fd0389ce5218aa31 Mon Sep 17 00:00:00 2001 From: "Prof. Dr. Matthias Jung DL9MJ" Date: Mon, 26 May 2025 00:00:32 +0200 Subject: [PATCH 2/2] feature: new test with two morse codes in one line --- test/acceptanceTest.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/acceptanceTest.md b/test/acceptanceTest.md index 3d5c06c..97e5bcd 100644 --- a/test/acceptanceTest.md +++ b/test/acceptanceTest.md @@ -94,7 +94,7 @@ CQ CQ hier ist DL1PZ mit einem allgemeinen Anruf, hier ist DL1PZ und hört. [table:n_morsetelegrafie_morsecode_buchstaben:Morsecode (Buchstaben)] -Das ist ein A in Morsecode: [morse:a], das finde ich ganz toll! +Das ist ein A in Morsecode: [morse:a], und das ist ein B: ([morse:b]) das finde ich ganz toll! ...