commit 667b9a5015272d189629ff8f01f1496383e33737
author Brian James Minchau <minchau@apache.org> Thu Mar 09 18:14:57 2006 +0000
committer Brian James Minchau <minchau@apache.org> Thu Mar 09 18:14:57 2006 +0000
tree 3f5d42a68da1a616d919b96ab28aead59ba28f29
parent 915a01868250d9169f5bed7d8b4842edbfeaf273

Added a special case for '&' when outputting an attribute
value that is a URI in HTML output. Committing the fix for
XALANJ-611

src/org/apache/xml/serializer/ToHTMLStream.java

diff --git a/src/org/apache/xml/serializer/ToHTMLStream.java b/src/org/apache/xml/serializer/ToHTMLStream.java
index 600637c..019f362 100644
--- a/src/org/apache/xml/serializer/ToHTMLStream.java
+++ b/src/org/apache/xml/serializer/ToHTMLStream.java
@@ -1312,6 +1312,19 @@
                 // We now we reset the next possible clean character.
                 cleanStart = i + 1;    
             }
+            else if (ch == '&')
+            {
+                // HTML 4.01 reads, "Authors should use "&" (ASCII decimal 38) 
+                // instead of "&" to avoid confusion with the beginning of a character 
+                // reference (entity reference open delimiter). 
+                if (cleanLength > 0)
+                {
+                    writer.write(chars, cleanStart, cleanLength);
+                    cleanLength = 0;
+                } 
+                writer.write("&");
+                cleanStart = i + 1; 
+            }
             else
             {
                 // no processing for this character, just count how