XML parser can have custom void elements

jhy · jhy · commit 0270598732b7 · 2025-04-15T17:32:00.000+10:00
Allows parsing of pseudo HTML with the HTML tag set, without using the HTML TreeBuilder rules For #2285
diff --git a/src/main/java/org/jsoup/parser/XmlTreeBuilder.java b/src/main/java/org/jsoup/parser/XmlTreeBuilder.java
@@ -159,6 +159,8 @@ void insertElementFor(Token.StartTag startTag) {
         if (startTag.isSelfClosing()) {
             tag.setSeenSelfClose();
             pop(); // push & pop ensures onNodeInserted & onNodeClosed
+        } else if (tag.isEmpty()) {
+            pop(); // custom defined void tag
         } else {
             TokeniserState textState = tag.textState();
             if (textState != null) tokeniser.transition(textState);
diff --git a/src/test/java/org/jsoup/parser/XmlTreeBuilderTest.java b/src/test/java/org/jsoup/parser/XmlTreeBuilderTest.java
@@ -443,6 +443,46 @@ private static void assertXmlNamespace(Element el) {
         assertEquals(inner, zEl.data());
     }
 
+    @Test void canSetCustomVoid() {
+        String ns = "custom";
+        String xml = "<x xmlns=custom><foo><link><meta>";
+        TagSet custom = new TagSet();
+        custom.valueOf("link", ns).set(Tag.Void);
+        custom.valueOf("meta", ns).set(Tag.Void);
+        custom.valueOf("foo", "other").set(Tag.Void); // ns doesn't match, won't impact
+
+        Document doc = Jsoup.parse(xml, Parser.xmlParser().tagSet(custom));
+        String expect = "<x xmlns=\"custom\"><foo><link /><meta /></foo></x>";
+        assertEquals(expect, doc.html());
+    }
+
+    @Test void canSupplyWithHtmlTagSet() {
+        // use the properties of html tag set but without HtmlTreeBuilder rules
+        String xml = "<html xmlns=" + NamespaceHtml + "><div><script>a<b</script><img><p>";
+        Document doc = Jsoup.parse(xml, Parser.xmlParser().tagSet(TagSet.Html()));
+        doc.outputSettings().prettyPrint(true);
+        String expect = "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
+            " <div>\n" +
+            "  <script>//<![CDATA[\n" +
+            "a<b\n" +
+            "//]]></script>\n" +
+            "  <img />\n" +
+            "  <p></p>\n" +
+            " </div>\n" +
+            "</html>";
+        assertEquals(expect, doc.html());
+
+        doc.outputSettings().syntax(Syntax.html);
+        expect = "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
+            " <div>\n" +
+            "  <script>a<b</script>\n" +
+            "  <img>\n" +
+            "  <p></p>\n" +
+            " </div>\n" +
+            "</html>";
+        assertEquals(expect, doc.html());
+    }
+
     @Test void prettyFormatsTextInline() {
         // https://github.com/jhy/jsoup/issues/2141
         String xml = "<package><metadata xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n" +
@@ -612,5 +652,4 @@ private static void assertXmlNamespace(Element el) {
         assertEquals("<div id=\"1\" /><p /><div>Foo</div><div /><foo></foo>", TextUtil.stripNewlines(doc.outerHtml()));
         // we infer that empty els can be represented with self-closing if seen in parse
     }
-
 }
