commit 1eea8214aced4fcad79c6e9b6dc44518777ab8e8
author Iwao AVE! <harawata@gmail.com> Wed May 29 22:35:20 2019 +0900
committer Michael Osipov <michaelo@apache.org> Thu May 30 12:14:36 2019 +0200
tree 040ecff365c702d16ba9002a2c2cef11f61bbe29
parent f6fd521f566de1cdb813507ed3023fdd5978a1ca

[DOXIA-583] Avoid over-escaping table captions

This closes #17

doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java

diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
index b927234..c2deb43 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
@@ -2434,7 +2434,7 @@
     {
         if ( !this.tableCaptionXMLWriterStack.isEmpty() && this.tableCaptionXMLWriterStack.getLast() != null )
         {
-            this.tableCaptionXMLWriterStack.getLast().writeText( unifyEOLs( text ) );
+            this.tableCaptionXMLWriterStack.getLast().writeMarkup( unifyEOLs( text ) );
         }
         else if ( !this.tableContentWriterStack.isEmpty() && this.tableContentWriterStack.getLast() != null )
         {

doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java

diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
index c53e439..87be49a 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
@@ -2219,7 +2219,7 @@
     {
         if ( !this.tableCaptionXMLWriterStack.isEmpty() && this.tableCaptionXMLWriterStack.getLast() != null )
         {
-            this.tableCaptionXMLWriterStack.getLast().writeText( unifyEOLs( text ) );
+            this.tableCaptionXMLWriterStack.getLast().writeMarkup( unifyEOLs( text ) );
         }
         else if ( !this.tableContentWriterStack.isEmpty() && this.tableContentWriterStack.getLast() != null )
         {

doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java

diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
index 511dd8a..949761c 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
@@ -162,7 +162,7 @@
             sink.tableRow_();
             sink.tableRows_();
             sink.tableCaption();
-            sink.text( "caption1" );
+            sink.text( "caption&1" );
             sink.tableCaption_();
             sink.table_();
         }
@@ -173,7 +173,7 @@
 
         String actual = writer.toString();
         assertTrue( actual.contains( "<table border=\"0\" class=\"bodyTable\">"
-            + "<caption>caption1</caption>" ) );
+            + "<caption>caption&amp;1</caption>" ) );
         assertTrue( actual.contains( "<table border=\"0\" class=\"bodyTable\" align=\"left\">"
             + "<caption>caption2</caption>" ) );
         assertTrue( actual.contains( "<table border=\"0\" class=\"bodyTable\" align=\"right\">"

doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java

diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
index 39e47a4..b94f253 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
@@ -164,7 +164,7 @@
             sink.tableRow_();
             sink.tableRows_();
             sink.tableCaption();
-            sink.text( "caption1" );
+            sink.text( "caption&1" );
             sink.tableCaption_();
             sink.table_();
         }
@@ -175,7 +175,7 @@
 
         String actual = writer.toString();
         assertTrue( actual.contains( "<table border=\"0\" class=\"bodyTable\">"
-            + "<caption>caption1</caption>" ) );
+            + "<caption>caption&amp;1</caption>" ) );
         assertTrue( actual.contains( "<table border=\"0\" class=\"bodyTable\" align=\"left\">"
             + "<caption>caption2</caption>" ) );
         assertTrue( actual.contains( "<table border=\"0\" class=\"bodyTable\" align=\"right\">"