Tokenize closing Data as tagName, not LetterSequence

jhy · jhy · commit 7693192fb343 · 2025-05-29T10:50:16.000+10:00
Fixes #2332
diff --git a/CHANGES.md b/CHANGES.md
@@ -16,9 +16,10 @@
 * Added `Connection#readFully()` as a replacement for `Connection#bufferUp()` with an explicit IOException. Similarly, added `Connection#readBody()` over `Connection#body()`. Deprecated `Connection#bufferUp()`. [#2327](https://github.com/jhy/jsoup/pull/2327) 
 
 ### Bug Fixes
-* The contents of a  `script` in a `svg` foreign context should be parsed as script data, not text. [#2320](https://github.com/jhy/jsoup/issues/2320)
+* The contents of a `script` in a `svg` foreign context should be parsed as script data, not text. [#2320](https://github.com/jhy/jsoup/issues/2320)
 * `Tag#isFormSubmittable()` was updating the Tag's options. [#2323](https://github.com/jhy/jsoup/issues/2323)
 * The HTML pretty-printer would incorrectly trim whitespace when text followed an inline element in a block element. [#2325](https://github.com/jhy/jsoup/issues/2325)
+* Custom tags with hyphens or other non-letter characters in their names now work correctly as Data or RcData tags. Their closing tags are now tokenized properly. [#2332](https://github.com/jhy/jsoup/issues/2332)
 
 ## 1.20.1 (2025-04-29)
 
diff --git a/src/main/java/org/jsoup/parser/HtmlTreeBuilderState.java b/src/main/java/org/jsoup/parser/HtmlTreeBuilderState.java
@@ -624,9 +624,9 @@ private boolean inBodyStartTag(Token t, HtmlTreeBuilder tb) {
                 default:
                     Tag tag = tb.tagFor(startTag);
                     TokeniserState textState = tag.textState();
-                    // custom rcdata or rawtext (if we were in head, will have auto-transitioned here)
-                    if (textState != null) HandleTextState(startTag, tb, textState);
-                    else if (!tag.isKnownTag()) { // no other special rules for custom tags
+                    if (textState != null) { // custom rcdata or rawtext (if we were in head, will have auto-transitioned here)
+                        HandleTextState(startTag, tb, textState);
+                    } else if (!tag.isKnownTag()) { // no other special rules for custom tags
                         tb.insertElementFor(startTag);
                     } else if (inSorted(name, Constants.InBodyStartPClosers)) {
                         if (tb.inButtonScope("p")) tb.processEndTag("p");
diff --git a/src/main/java/org/jsoup/parser/TokeniserState.java b/src/main/java/org/jsoup/parser/TokeniserState.java
@@ -216,7 +216,7 @@ enum TokeniserState {
     RCDATAEndTagName {
         @Override void read(Tokeniser t, CharacterReader r) {
             if (r.matchesAsciiAlpha()) {
-                String name = r.consumeLetterSequence();
+                String name = r.consumeTagName();
                 t.tagPending.appendTagName(name);
                 t.dataBuffer.append(name);
                 return;
@@ -1673,7 +1673,7 @@ else if (r.matches('>')) {
      */
     private static void handleDataEndTag(Tokeniser t, CharacterReader r, TokeniserState elseTransition) {
         if (r.matchesAsciiAlpha()) {
-            String name = r.consumeLetterSequence();
+            String name = r.consumeTagName();
             t.tagPending.appendTagName(name);
             t.dataBuffer.append(name);
             return;
diff --git a/src/test/java/org/jsoup/parser/TokeniserStateTest.java b/src/test/java/org/jsoup/parser/TokeniserStateTest.java
@@ -270,4 +270,31 @@ public void attributeValUnquoted() {
         doc = Jsoup.parse("<p foo=");
         assertEquals("<p foo></p>", doc.body().html());
     }
+
+    @Test void customDataTagWithHyphen() {
+        // https://github.com/jhy/jsoup/issues/2332
+
+        TagSet tagSet = TagSet.Html();
+        tagSet.valueOf("custom-data", Parser.NamespaceHtml).set(Tag.Data);
+        tagSet.valueOf("custom-rcdata", Parser.NamespaceHtml).set(Tag.RcData);
+
+        String html = "<body><custom-data>a < > b</custom-data><p>One</p><custom-rcdata>a < > b</custom-rcdata><p>Two</p>";
+        Document doc = Jsoup.parse(html, Parser.htmlParser().tagSet(tagSet));
+        assertEquals(
+            "<custom-data>a < > b</custom-data><p>One</p><custom-rcdata>a &lt; &gt; b</custom-rcdata><p>Two</p>",
+            TextUtil.normalizeSpaces(doc.body().html()));
+    }
+
+    @Test void customDataTagWithHyphenXml() {
+        String xml = "<custom-data>a < > b</custom-data><p>One</p><custom-rcdata>a < > b</custom-rcdata><p>Two</p>";
+        Parser parser = Parser.xmlParser();
+        TagSet tagSet = parser.tagSet();
+        tagSet.valueOf("custom-data", Parser.NamespaceXml).set(Tag.Data);
+        tagSet.valueOf("custom-rcdata", Parser.NamespaceXml).set(Tag.RcData);
+
+        Document doc = Jsoup.parse(xml, parser);
+        assertEquals(
+            "<custom-data><![CDATA[a < > b]]></custom-data><p>One</p><custom-rcdata>a &lt; &gt; b</custom-rcdata><p>Two</p>",
+            TextUtil.normalizeSpaces(doc.html()));
+    }
 }
