From 655cfd3c09d86b8e0f967dcdc59ada68faa0b22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20R=C3=BCdenauer?= Date: Fri, 20 Jun 2025 12:11:14 +0200 Subject: [PATCH 1/3] Moinwiki converter: make definition lists have lowest precedence in indent_re --- src/moin/converters/moinwiki_in.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/moin/converters/moinwiki_in.py b/src/moin/converters/moinwiki_in.py index b6519f413..576965bc5 100644 --- a/src/moin/converters/moinwiki_in.py +++ b/src/moin/converters/moinwiki_in.py @@ -374,10 +374,10 @@ def block_text_repl(self, _iter_content, stack, text): ^ (?P \s* ) (?P - (?P - (?P .*? ) - :: - ) + (?P \* ) + \s* + | + (?P \. ) \s* | (?P [0-9]+\. (\#(?P[0-9]+))?) @@ -389,10 +389,10 @@ def block_text_repl(self, _iter_content, stack, text): (?P [iI]\. (\#(?P[0-9]+))?) \s+ | - (?P \* ) - \s* - | - (?P \. ) + (?P + (?P .*? ) + :: + ) \s* )? (?P .*? ) From 1c110eafb79712db02bec6734db09b197b3eb4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20R=C3=BCdenauer?= Date: Fri, 20 Jun 2025 12:14:50 +0200 Subject: [PATCH 2/3] Moinwiki converter: pop top of stack for closing strike through character sequence --- src/moin/converters/moinwiki_in.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/moin/converters/moinwiki_in.py b/src/moin/converters/moinwiki_in.py index 576965bc5..b21f43b07 100644 --- a/src/moin/converters/moinwiki_in.py +++ b/src/moin/converters/moinwiki_in.py @@ -650,6 +650,8 @@ def inline_strike_repl(self, stack, strike, strike_begin=None): """Ignore the closing stroke tag if no opening tag found""" if strike_begin is not None: stack.push(moin_page.del_()) + elif strike == ")--" and stack and stack.top_check("del"): + stack.pop() inline_subscript = r""" (?P From 72c3ce107f538b90bb317e8efc2b79bbb470da52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20R=C3=BCdenauer?= Date: Fri, 20 Jun 2025 14:08:25 +0200 Subject: [PATCH 3/3] Moinwiki converter: add additional test cases --- src/moin/converters/_tests/test_moinwiki_in.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/moin/converters/_tests/test_moinwiki_in.py b/src/moin/converters/_tests/test_moinwiki_in.py index 511a30399..a4dad6f01 100644 --- a/src/moin/converters/_tests/test_moinwiki_in.py +++ b/src/moin/converters/_tests/test_moinwiki_in.py @@ -176,6 +176,10 @@ def test_inline(self, input, output): " * Item", 'Item', ), + ( + " . Item", + 'Item', + ), ( " 1. Item", 'Item', @@ -212,6 +216,10 @@ def test_inline(self, input, output): " * List 1\n 1. List 2", 'List 1List 2', ), + ( + " * --(A::B)--", + 'A::B', + ), ] @pytest.mark.parametrize("input,output", data)