feat: implement Xdoclint and html5 options since those are set by Gradle and can't get switched off

Signed-off-by: manticore-projects <andreas@manticore-projects.com>

Author: manticore-projects

build.gradle

@@ -290,15 +290,17 @@ tasks.register('xmldoc', Javadoc) {
     dependsOn(jar)
     source = sourceSets.main.allJava
     classpath = sourceSets.main.runtimeClasspath
-
     // beware: Gradle deletes this folder automatically and there is no switch-off
     destinationDir = reporting.file("xmlDoclet")
-    options.docletpath = configurations.xmlDoclet.files.asType(List)
-    options.doclet = "com.manticore.tools.xmldoclet.XmlDoclet"
     title = "API $version"
-    options.addBooleanOption("rst", true)
-    options.addBooleanOption("withFloatingToc", true)
-    options.addStringOption("basePackage", "com.manticore.tools.xmldoclet")
+
+    options {
+        docletpath = configurations.xmlDoclet.files.asType(List)
+        doclet = "com.manticore.tools.xmldoclet.XmlDoclet"
+        addBooleanOption("rst", true)
+        addBooleanOption("withFloatingToc", true)
+        addStringOption("basePackage", "com.manticore.tools.xmldoclet")
+    }
 
     doLast {
         copy {

src/main/java/com/manticore/tools/xmldoclet/Parser.java

@@ -81,9 +81,9 @@ String getJavaDoc(final Element element) {
 
         // Fix issue #12: Remove commas that are added around HTML tags and entities
         // Pattern: comma followed by < or & or > or ;
-        commentText = commentText.replaceAll(",(<|&|>|;)", "$1");
+        commentText = commentText.replaceAll(",([<&>;])", "$1");
         // Pattern: < or & or > or ; followed by comma
-        commentText = commentText.replaceAll("(<|&|>|;),", "$1");
+        commentText = commentText.replaceAll("([<&>;]),", "$1");
 
         return commentText;
     }

src/main/java/com/manticore/tools/xmldoclet/SupportedOptions.java

@@ -16,7 +16,7 @@ final class SupportedOptions {
     /**
      * A Map where the key is an option name and the value is the argument value
      * (considering each argument has at most one value).
-     * It stores all sucessfuly parsed options given to the Doclet in the command line.
+     * It stores all successfully parsed options given to the Doclet in the command line.
      */
     private final Map<String, String> givenCliOptionsMap = new HashMap<>();
 
@@ -39,7 +39,16 @@ public SupportedOptions() {
                 newOneArgOption("doctitle", "Document Title\n"),
                 newOneArgOption("windowtitle", "Window Title\n"),
                 newNoArgOption("noTimestamp", "No Timestamp.\n"),
-                newNoArgOption("withFloatingToc", "Renders a Floating TOC on the right side.\n"));
+                newNoArgOption("withFloatingToc", "Renders a Floating TOC on the right side.\n"),
+
+                // Compatibility to standard JavaDoc options since there is no apparent way to filter/remove
+                newNoArgOption("Xdoclint:none", "Compatibility only, will be ignored.\n"),
+                newNoArgOption("Xdoclint:all", "Compatibility only, will be ignored.\n"),
+                newNoArgOption("Xdoclint:html", "Compatibility only, will be ignored.\n"),
+                newNoArgOption("Xdoclint:syntax", "Compatibility only, will be ignored.\n"),
+                newNoArgOption("Xdoclint:reference", "Compatibility only, will be ignored.\n"),
+                newNoArgOption("Xdoclint:missing", "Compatibility only, will be ignored.\n"),
+                newNoArgOption("html5", "Compatibility only, will be ignored.\n"));
     }
 
     public Set<CustomOption> get() {

src/site/sphinx/changelog.md

@@ -2,6 +2,31 @@
 
 Changelog of xml-doclet.
 
+## 2.0.8 (2025-07-12)
+
+### Other changes
+
+
+## 2.0.7 (2025-07-12)
+
+### Other changes
+
+
+## 2.0.6 (2025-07-12)
+
+### Other changes
+
+
+## 2.0.5 (2025-07-12)
+
+### Other changes
+
+
+## 2.0.4 (2025-07-12)
+
+### Other changes
+
+
 ## 2.0.3 (2025-03-03)
 
 ### Bug Fixes