# HG changeset patch # User Franz Glasner # Date 1777372802 -7200 # Node ID 05c53e431c88244972fd1f5647d490aed741d20f # Parent 414bf3cbb1520eba3eb53756f75a3326c290f51a Simplify case-handling for "BLOCK" and "REMARK" diff -r 414bf3cbb152 -r 05c53e431c88 pygments_lexer_pseudocode2/algpseudocode.py --- a/pygments_lexer_pseudocode2/algpseudocode.py Tue Apr 28 10:10:04 2026 +0200 +++ b/pygments_lexer_pseudocode2/algpseudocode.py Tue Apr 28 12:40:02 2026 +0200 @@ -76,28 +76,12 @@ SYMBOL_TEXTSTATEMENT = "■" # U+25A0: Unicode 1.0 (Geometric Shapes) SYMBOLS = { "REMARK": SYMBOL_REMARK, - "Remark": SYMBOL_REMARK, - "remark": SYMBOL_REMARK, "REM": SYMBOL_REMARK, - "Rem": SYMBOL_REMARK, - "rem": SYMBOL_REMARK, - "R": SYMBOL_REMARK, - "r": SYMBOL_REMARK, "BLOCK": SYMBOL_BLOCK, - "Block": SYMBOL_BLOCK, - "block": SYMBOL_BLOCK, "TEXTSTATEMENT": SYMBOL_TEXTSTATEMENT, - "TextStatement": SYMBOL_TEXTSTATEMENT, - "textstatement": SYMBOL_TEXTSTATEMENT, "TSTATEMENT": SYMBOL_TEXTSTATEMENT, - "TStatement": SYMBOL_TEXTSTATEMENT, - "tstatement": SYMBOL_TEXTSTATEMENT, "TSTATE": SYMBOL_TEXTSTATEMENT, - "TState": SYMBOL_TEXTSTATEMENT, - "tstate": SYMBOL_TEXTSTATEMENT, "TEXT": SYMBOL_TEXTSTATEMENT, - "Text": SYMBOL_TEXTSTATEMENT, - "text": SYMBOL_TEXTSTATEMENT, } def op_translate(toktype): @@ -132,7 +116,7 @@ def op_symbol(toktype): def _op_symbol(lexer, match, ctx=None): - kw = match.group() + kw = match.group().upper() yield match.start(), toktype, lexer.SYMBOLS.get(kw, kw) return _op_symbol @@ -142,9 +126,9 @@ (r"\n", Whitespace), (r"/\*", Comment.Multiline, "multiline-nested-comment"), (r"//.*$", Comment.Single), - (r"(?:\\)(REMARK|Remark|remark|REM|Rem|rem|R|r)\b(.*)$", + (r"(?i)\\(remark|rem)\b(.*)$", bygroups(op_symbol(Comment.Single), Comment.Single)), - (r"(?:\\)(BLOCK|Block|block)\b(.*)$", + (r"(?i)\\(block)\b(.*)$", bygroups(op_symbol(Text), Text)), (r"\\\n", Text), (r"(?i)\\(" diff -r 414bf3cbb152 -r 05c53e431c88 tests/test_algpseudo.py --- a/tests/test_algpseudo.py Tue Apr 28 10:10:04 2026 +0200 +++ b/tests/test_algpseudo.py Tue Apr 28 12:40:02 2026 +0200 @@ -274,14 +274,10 @@ ("Comment.Single", "▷"), ("Comment.Single", " the remark 2"), ("Text.Whitespace", "\n"), - ("Comment.Single", "▷"), - ("Comment.Single", " the remark 3"), - ("Text.Whitespace", "\n"), ], pygments.lex( - """\\REMARK the remark 1 + """\\remArk the remark 1 \\Rem the remark 2 -\\r the remark 3 """, self.lexer))