? X§}tled1.CRASHED
? autom4te-2.53.cache
? merge.abw
? merge.wml
? pSS
? testing_123.abw
? utf8.diff
? wierd_merge.abw
? src/other/ttftool/GNUmakefile.in
? src/other/ttftool/unix/GNUmakefile.in
? src/wp/impexp/xp/Untitled1.CRASHED
? src/wp/impexp/xp/merged_cells.abw
? src/wp/impexp/xp/merged_cells.dbk
? src/wp/impexp/xp/merged_cells.xhtml
? src/wp/impexp/xp/nested_tables.abw
? src/wp/impexp/xp/nested_tables.xhtml
? src/wp/impexp/xp/simple_table.abw
? src/wp/impexp/xp/simple_table.dbk
? src/wp/impexp/xp/simple_table.xhtml
? src/wp/main/cocoa/AbiWord.app/GNUmakefile.in
? src/wp/main/cocoa/AbiWord.app/Contents/GNUmakefile.in
? src/wp/main/cocoa/AbiWord.app/Contents/Frameworks/GNUmakefile.in
? src/wp/main/cocoa/AbiWord.app/Contents/MacOS/GNUmakefile.in
? src/wp/main/cocoa/AbiWord.app/Contents/Resources/GNUmakefile.in
? src/wp/main/cocoa/AbiWord.app/Contents/Resources/English.lproj/GNUmakefile.in
Index: src/af/ev/unix/ev_UnixToolbar.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/ev/unix/ev_UnixToolbar.cpp,v
retrieving revision 1.86
diff -u -r1.86 ev_UnixToolbar.cpp
--- src/af/ev/unix/ev_UnixToolbar.cpp	13 Sep 2002 00:03:27 -0000	1.86
+++ src/af/ev/unix/ev_UnixToolbar.cpp	15 Sep 2002 15:01:52 -0000
@@ -543,9 +543,7 @@
 	UT_ASSERT((szValue) && (*szValue));
 	
 	GtkToolbarStyle style = GTK_TOOLBAR_ICONS;
-	if (UT_XML_stricmp(szValue,"icon")==0)
-		style = GTK_TOOLBAR_ICONS;
-	else if (UT_XML_stricmp(szValue,"text")==0)
+	if (UT_XML_stricmp(szValue,"text")==0)
 		style = GTK_TOOLBAR_TEXT;
 	else if (UT_XML_stricmp(szValue,"both")==0)
 		style = GTK_TOOLBAR_BOTH;
Index: src/wp/impexp/xp/ie_exp_AbiWord_1.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_exp_AbiWord_1.cpp,v
retrieving revision 1.123
diff -u -r1.123 ie_exp_AbiWord_1.cpp
--- src/wp/impexp/xp/ie_exp_AbiWord_1.cpp	13 Sep 2002 17:20:24 -0000	1.123
+++ src/wp/impexp/xp/ie_exp_AbiWord_1.cpp	15 Sep 2002 15:02:29 -0000
@@ -33,7 +33,6 @@
 #ifdef ENABLE_RESOURCE_MANAGER
 #include "xap_ResourceManager.h"
 #endif
-#include "xap_EncodingManager.h"
 
 #include "xap_App.h"
 
@@ -450,7 +449,7 @@
 
 void s_AbiWord_1_Listener::_outputData(const UT_UCSChar * data, UT_uint32 length)
 {
-	UT_String sBuf;
+	UT_UTF8String sBuf;
 	const UT_UCSChar * pData;
 
 	UT_ASSERT(sizeof(UT_Byte) == sizeof(char));
@@ -495,55 +494,17 @@
 			break;
 
 		default:
-			if (*pData > 0x007f)
-			{
-				if(XAP_EncodingManager::get_instance()->isUnicodeLocale() ||
-				   (XAP_EncodingManager::get_instance()->try_nativeToU(0xa1) == 0xa1))
-
-				{
-					XML_Char * pszUTF8 = UT_encodeUTF8char(*pData++);
-					while (*pszUTF8)
-					{
-						sBuf += (char)*pszUTF8;
-						pszUTF8++;
-					}
-				}
-				else
-				{
-					/*
-					Try to convert to native encoding and if
-					character fits into byte, output raw byte. This
-					is somewhat essential for single-byte non-latin
-					languages like russian or polish - since
-					tools like grep and sed can be used then for
-					these files without any problem.
-					Networks and mail transfers are 8bit clean
-					these days.  - VH
-					*/
-					UT_UCSChar c = XAP_EncodingManager::get_instance()->try_UToNative(*pData);
-					if (c==0 || c>255)
-					{
-						sBuf += UT_String_sprintf("&#x%x;",*pData++);
-					}
-					else
-					{
-						sBuf += (char)c;
-						pData++;
-					}
-				}
-			}
-			else if (*pData < 0x20)         // Silently eat these characters.
+			if (*pData < 0x20)         // Silently eat these characters.
 				pData++;
 			else
-			{
-				sBuf += (char)*pData; 
-                pData++;
-			}
-			break;
+				{
+					sBuf.appendUCS4 (pData, 1);
+					pData++;
+				}
 		}
 	}
 
-	m_pie->write(sBuf.c_str(),sBuf.size());
+	m_pie->write(sBuf.utf8_str(),sBuf.size());
 }
 
 s_AbiWord_1_Listener::s_AbiWord_1_Listener(PD_Document * pDocument,
@@ -564,21 +525,8 @@
 	m_pCurrentField = 0;
 	m_iInTable = 0;
 	m_iInCell = 0;
-	// Be nice to XML apps.  See the notes in _outputData() for more
-	// details on the charset used in our documents.  By not declaring
-	// any encoding, XML assumes we're using UTF-8.  Note that US-ASCII
-	// is a strict subset of UTF-8.
-
-	if (!XAP_EncodingManager::get_instance()->cjk_locale() &&
-	    (XAP_EncodingManager::get_instance()->try_nativeToU(0xa1) != 0xa1)) {
-	    // use utf8 for CJK locales and latin1 locales and unicode locales
-	    m_pie->write("<?xml version=\"1.0\" encoding=\"");
-	    m_pie->write(XAP_EncodingManager::get_instance()->getNativeEncodingName());
-	    m_pie->write("\"?>\n");
-	} else {
-	    m_pie->write("<?xml version=\"1.0\"?>\n");
-	}
 
+	m_pie->write("<?xml version=\"1.0\"?>\n");
 	m_pie->write ("<!DOCTYPE abiword PUBLIC \"-//ABISOURCE//DTD AWML 1.0 Strict//EN\" \"http://www.abisource.com/awml.dtd\">\n");
 
 	/***********************************************************************************