xml-xalan-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject svn commit: r377447 - in /xalan/c/trunk/src/xalanc/XMLSupport: FormatterToXML.cpp FormatterToXMLUnicode.hpp
Date Mon, 13 Feb 2006 18:20:27 GMT
Author: dbertoni
Date: Mon Feb 13 10:20:26 2006
New Revision: 377447

URL: http://svn.apache.org/viewcvs?rev=377447&view=rev
Log:
Fixes for Jira issue XALANC-598.

Modified:
    xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
    xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
URL: http://svn.apache.org/viewcvs/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp?rev=377447&r1=377446&r2=377447&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp Mon Feb 13 10:20:26 2006
@@ -387,9 +387,9 @@
         }
     }
 
-	m_attrCharsMap[XalanUnicode::charHTab] = 'S';
-	m_attrCharsMap[XalanUnicode::charLF] = 'S';
-	m_attrCharsMap[XalanUnicode::charCR] = 'S';
+    m_attrCharsMap[XalanUnicode::charHTab] = 'S';
+    m_attrCharsMap[XalanUnicode::charLF] = 'S';
+    m_attrCharsMap[XalanUnicode::charCR] = 'S';
 
     for(size_t i = 1; i < 0x20; i++)
     {
@@ -430,7 +430,7 @@
         m_charsMap[j] = 'S';
     }
 
-	m_charsMap[9] = '\0';
+    m_charsMap[9] = '\0';
 
     assert(m_maxCharacter != 0);
 
@@ -812,11 +812,11 @@
 }
 
 void
-FormatterToXML::throwInvalidCharacterException( unsigned int		ch,
+FormatterToXML::throwInvalidCharacterException( unsigned int        ch,
                                                 MemoryManagerType&  theManager)
 {
-    XalanDOMString	theMessage(theManager);
-    XalanDOMString	theBuffer(theManager);  
+    XalanDOMString  theMessage(theManager);
+    XalanDOMString  theBuffer(theManager);  
 
     XalanMessageLoader::getMessage(
             theMessage,
@@ -885,11 +885,11 @@
                 next = ((ch - 0xd800u) << 10) + next - 0xdc00u + 0x00010000u;
             }
 
-			writeNumberedEntityReference(next);
-		}
-		else 
-		{
-			if(ch > m_maxCharacter)
+            writeNumberedEntityReference(next);
+        }
+        else 
+        {
+            if(ch > m_maxCharacter)
             {
                 if( !m_isXML1_1 && XalanUnicode::charLSEP == ch ) 
                 {
@@ -901,7 +901,7 @@
                 }
             }
             else if(ch < SPECIALSSIZE && m_attrCharsMap[ch] == 'S')
-			{
+            {
                 if(ch < 0x20 )
                 {
                     if(m_isXML1_1)
@@ -928,13 +928,13 @@
                 {
                     writeNumberedEntityReference(ch);
                 }
-			}
-			else
-			{
-				accumContent(ch);
-			}
-		}
-	}
+            }
+            else
+            {
+                accumContent(ch);
+            }
+        }
+    }
 
     return i;
 }
@@ -1080,9 +1080,9 @@
 
         if(m_doIndent)
         {
-		    outputLineSep();
+            outputLineSep();
         }
-	}	   
+    }      
 
 }
 
@@ -1240,13 +1240,6 @@
 
         accumName(XalanUnicode::charQuestionMark);
         accumName(XalanUnicode::charGreaterThanSign);
-
-        // If outside of an element, then put in a new line.  This whitespace
-        // is not significant.
-        if (m_elemStack.empty() == true)
-        {
-            outputLineSep();
-        }
 
         m_startNewLine = true;
     }

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp
URL: http://svn.apache.org/viewcvs/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp?rev=377447&r1=377446&r2=377447&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp Mon Feb 13 10:20:26 2006
@@ -398,13 +398,6 @@
 
         m_writer.write(value_type(XalanUnicode::charQuestionMark));
         m_writer.write(value_type(XalanUnicode::charGreaterThanSign));
-
-        // If outside of an element, then put in a new line.  This whitespace
-        // is not significant.
-        if (outsideDocumentElement() == true)
-        {
-            outputNewline();
-        }
     }
 
     void



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message