This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git


The following commit(s) were added to refs/heads/master by this push:
     new 88265a42 Do not nest verbatim for a source element inside a source 
element in XDoc
88265a42 is described below

commit 88265a42518740e9b0124b164b5354a07ddece4f
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Nov 14 10:39:08 2026 +0000

    Do not nest verbatim for a source element inside a source element in XDoc
    
    Same fix as for FML: only the outermost source element opens and closes
    the verbatim block.
---
 .../apache/maven/doxia/module/xdoc/XdocParser.java  | 18 +++++++++++++-----
 .../maven/doxia/module/xdoc/XdocParserTest.java     | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git 
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
 
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
index c7c2cf01..0c8efaa0 100644
--- 
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
+++ 
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
@@ -84,6 +84,9 @@ public class XdocParser extends Xhtml1BaseParser implements 
XdocMarkup {
      */
     private boolean hasTitle;
 
+    /** Number of currently open {@code source} elements; verbatim blocks must 
not be nested. */
+    private int sourceDepth;
+
     public void parse(Reader source, Sink sink, String reference) throws 
ParseException {
         this.sourceContent = null;
 
@@ -155,11 +158,13 @@ public class XdocParser extends Xhtml1BaseParser 
implements XdocMarkup {
         } else if (parser.getName().equals(SUBSECTION_TAG.toString())) {
             handleSectionStart(Sink.SECTION_LEVEL_2, sink, attribs, parser);
         } else if (parser.getName().equals(SOURCE_TAG.toString())) {
-            verbatim();
+            if (sourceDepth++ == 0) {
+                verbatim();
 
-            attribs.addAttributes(SinkEventAttributeSet.SOURCE);
+                attribs.addAttributes(SinkEventAttributeSet.SOURCE);
 
-            sink.verbatim(attribs);
+                sink.verbatim(attribs);
+            }
         } else if (parser.getName().equals(PROPERTIES_TAG.toString())) {
             if (!inHead) // we might be in head from a <head> already
             {
@@ -214,9 +219,11 @@ public class XdocParser extends Xhtml1BaseParser 
implements XdocMarkup {
         } else if (parser.getName().equals(DATE_TAG.toString())) {
             sink.date_();
         } else if (parser.getName().equals(SOURCE_TAG.toString())) {
-            verbatim_();
+            if (--sourceDepth == 0) {
+                verbatim_();
 
-            sink.verbatim_();
+                sink.verbatim_();
+            }
         } else if (parser.getName().equals(PROPERTIES_TAG.toString())) {
             // Do nothing, head is closed with BODY start.
         } else if (parser.getName().equals(MACRO_TAG.toString())) {
@@ -260,6 +267,7 @@ public class XdocParser extends Xhtml1BaseParser implements 
XdocMarkup {
         this.macroParameters = null;
         this.inHead = false;
         this.hasTitle = false;
+        this.sourceDepth = 0;
     }
 
     /**
diff --git 
a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
 
b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
index 39245afe..231bb06b 100644
--- 
a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
+++ 
b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
@@ -279,6 +279,27 @@ class XdocParserTest extends AbstractParserTest {
         assertSinkEquals(it, "verbatim", "text", "verbatim_");
     }
 
+    @Test
+    void nestedSourceYieldsSingleVerbatim() throws Exception {
+        // a POM snippet without CDATA, whose configuration contains a source 
element
+        String text = 
"<div><source>a<source>1.5</source>b</source><p>after</p></div>";
+
+        Iterator<SinkEventElement> it = parseText(text);
+
+        assertSinkEquals(
+                it,
+                "division",
+                "verbatim",
+                "text",
+                "text",
+                "text",
+                "verbatim_",
+                "paragraph",
+                "text",
+                "paragraph_",
+                "division_");
+    }
+
     @Test
     void sourceContainingDTD() throws Exception {
         String text = "<source><![CDATA[" + "<!DOCTYPE web-app PUBLIC "

Reply via email to