--- Generator.java	(revision 582520)
+++ Generator.java	(working copy)
@@ -1752,10 +1752,7 @@ 
                 out.print(attrs.getQName(i));
                 out.print("=");
                 String quote = DOUBLE_QUOTE;
-                String value = attrs.getValue(i);
-                if (value.indexOf('"') != -1) {
-                    quote = SINGLE_QUOTE;
-                }
+                String value = attrs.getValue(i).replace("\"", "&");
                 out.print(quote);
                 out.print(value);
                 out.print(quote);
@@ -1774,10 +1771,7 @@ 
                     out.print(" + \"\\\"");
                 } else {
                     String quote = DOUBLE_QUOTE;
-                    String value = attrs.getValue(i);
-                    if (value.indexOf('"') != -1) {
-                        quote = SINGLE_QUOTE;
-                    }
+                    String value = attrs.getValue(i).replace("\"", "&");
                     out.print(quote);
                     out.print(value);
                     out.print(quote);