cvs commit: xml-xalan/src/org/apache/xalan/xpath/xml FormatterToXML.java

[sboag]

sboag       00/02/03 09:21:31

  Modified:    src/org/apache/xalan/xpath/xml FormatterToXML.java
  Log:
  Fix for encoding problem,  SPR #PDIK4G6MYB, wasn't handling UTF-8 encoding 
properly.  Reported by Christian Mallwitz <[EMAIL PROTECTED]>.
  
  Revision  Changes    Path
  1.19      +11 -5     
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java
  
  Index: FormatterToXML.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- FormatterToXML.java       2000/01/28 22:40:15     1.18
  +++ FormatterToXML.java       2000/02/03 17:21:31     1.19
  @@ -428,8 +428,7 @@
     {    
       this.m_encoding = getMimeEncoding(format.getEncoding());
       
  -    if(this.m_encoding.equals(DEFAULT_MIME_ENCODING) || 
  -       this.m_encoding.equals("WINDOWS-1250") ||
  +    if(this.m_encoding.equals("WINDOWS-1250") ||
          this.m_encoding.equals("US-ASCII") ||
          this.m_encoding.equals("ASCII"))
       {
  @@ -1386,9 +1385,16 @@
         }
         else 
         {
  -        accum("&#");
  -        accum(Integer.toString(ch));
  -        accum(";");
  +        if(ch > m_maxCharacter)
  +        {
  +          accum("&#");
  +          accum(Integer.toString(ch));
  +          accum(";");
  +        }
  +        else
  +        {
  +          accum(ch);
  +        }
         }
       }
     }