Fix #542: XML element names should better match the spec

bobbylight · Jun 9, 2024 · 13523f5 · 13523f5
1 parent 329b3c6
commit 13523f5
Show file tree

Hide file tree

Showing 4 changed files with 215 additions and 127 deletions.
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenMaker.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenMaker.java
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex
@@ -368,8 +368,8 @@ import org.fife.ui.rsyntaxtextarea.*;
 
 %}
 
-NameStartChar		= ([\:A-Z_a-z])
-NameChar			= ({NameStartChar}|[\-\.0-9])
+NameStartChar       = (":" | [A-Z] | "_" | [a-z] | [\u00C0-\u00D6] | [\u00D8-\u00F6] | [\u00F8-\u02FF] | [\u0370-\u037D] | [\u037F-\u1FFF] | [\u200C-\u200D] | [\u2070-\u218F] | [\u2C00-\u2FEF] | [\u3001-\uD7FF] | [\uF900-\uFDCF] | [\uFDF0-\uFFFD])
+NameChar			= ({NameStartChar} | "-" | "." | [0-9] | #xB7 | [\u0300-\u036F] | [\u203F-\u2040])
 TagName				= ({NameStartChar}{NameChar}*)
 Whitespace			= ([ \t\f])
 LineTerminator			= ([\n])