Index: wp-testcase/test_includes_formatting.php
===================================================================
--- wp-testcase/test_includes_formatting.php	(revision 444)
+++ wp-testcase/test_includes_formatting.php	(working copy)
@@ -1164,4 +1164,43 @@
 	}
 }
 
+class TestRemoveAccents extends WPTestCase {
+	public function test_remove_accents_simple() {
+		$this->assertEquals( 'abcdefghijkl', remove_accents( 'abcdefghijkl' ) );
+	}
+
+	public function test_remove_accents_latin1_supplement() {
+		$input = 'ªºÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ';
+		$output = 'aoAAAAAAAECEEEEIIIIDNOOOOOOUUUUYTHsaaaaaaaeceeeeiiiidnoooooouuuuythy';
+
+		$this->assertEquals( $output, remove_accents( $input ), 'remove_accents replaces Latin-1 Supplement' );
+	}
+
+	public function test_remove_accents_latin_extended_a() {
+		$input = 'ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſ';
+		$output = 'AaAaAaCcCcCcCcDdDdEeEeEeEeEeGgGgGgGgHhHhIiIiIiIiIiIJijJjKkkLlLlLlLlLlNnNnNnNnNOoOoOoOEoeRrRrRrSsSsSsSsTtTtTtUuUuUuUuUuUuWwYyYZzZzZzs';
+
+		$this->assertEquals( $output, remove_accents( $input ), 'remove_accents replaces Latin Extended A' );
+	}
+
+	public function test_remove_accents_latin_extended_b() {
+		$this->assertEquals( 'SsTt', remove_accents( 'ȘșȚț' ), 'remove_accents replaces Latin Extended B' );
+	}
+
+	public function test_remove_accents_euro_pound_signs() {
+		$this->assertEquals( 'E', remove_accents( '€' ), 'remove_accents replaces euro sign' );
+		$this->assertEquals( '', remove_accents( '£' ), 'remove_accents replaces pound sign' );
+	}
+
+	public function test_remove_accents_iso8859() {
+		// File is Latin1 encoded
+		$file = DIR_TESTDATA . DIRECTORY_SEPARATOR . 'formatting' . DIRECTORY_SEPARATOR . 'remove_accents.01.input.txt';
+		$input = file_get_contents( $file );
+		$input = trim( $input );
+		$output = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyyOEoeAEDHTHssaedhth";
+
+		$this->assertEquals( $output, remove_accents( $input ), 'remove_accents from ISO-8859-1 text' );
+	}
+}
+
 ?>
Index: wp-testcase/jacob/TestFormatting.php
===================================================================
--- wp-testcase/jacob/TestFormatting.php	(revision 444)
+++ wp-testcase/jacob/TestFormatting.php	(working copy)
@@ -81,57 +81,6 @@
 }
 
 /*
-Removes accents from characters and decomposes ligatures.
-*/
-class Test_Remove_Accents extends _WPFormattingTest {
-    
-    /*
-    http://www.alanwood.net/unicode/latin_1_supplement.html
-
-    unicode-latin-1-supplement is identical to iso-8859-1, so these
-    tests on their own will never take the unicode codepath
-    */    
-    function test_removes_accents_from_decomposable_latin1_supplement() {
-        $this->file_test("removes_accents_from_decomposable_latin1_supplement",
-            "remove_accents");
-    }
-    
-    /*
-    Several characters, such as eth and thorn, do not have a unicode
-    decomposition, but should be replaced. The eth, for example, should become
-    "d" or "dh", and the thorn "th". They require special rules.
-    */
-    function test_removes_accents_from_undecomposable_latin1_supplement() {
-        $this->file_test("removes_accents_from_undecomposable_latin1_supplement",
-            "remove_accents");
-    }   
-    function test_removes_accents_from_latin1_supplement() {
-        $this->file_test("removes_accents_from_latin1_supplement",
-            "remove_accents");
-    }
-
-    function test_removes_accents_from_decomposable_latin_extended_a() {
-        $this->file_test("removes_accents_from_decomposable_latin_extended_a",
-            "remove_accents");
-    }    
-    function test_removes_accents_from_undecomposable_latin_extended_a() {
-        $this->file_test("removes_accents_from_undecomposable_latin_extended_a",
-            "remove_accents");
-    }   
-    function test_removes_accents_from_latin_extended_a() {
-        $this->file_test("removes_accents_from_latin_extended_a",
-            "remove_accents");
-    }
-
-    // Currently this test fails because the unicode codepath (seems_utf8 == true)
-    // can't handle non-decomposable characters (eth and friends).
-    function test_removes_accents_from_latin1_supplement_and_latin_extended_a() {
-        $this->file_test("removes_accents_from_latin1_supplement_and_latin_extended_a",
-            "remove_accents");
-    }
-}
-
-/*
 Decodes text in RFC2047 "Q"-encoding, e.g.
 
     =?iso-8859-1?q?this=20is=20some=20text?=
Index: wp-testdata/formatting/remove_accents.01.input.txt
===================================================================
--- wp-testdata/formatting/remove_accents.01.input.txt	(revision 0)
+++ wp-testdata/formatting/remove_accents.01.input.txt	(revision 0)
@@ -0,0 +1 @@
+��������������������������������������������������������������������������

Property changes on: wp-testdata/formatting/remove_accents.01.input.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain; charset=ISO-8859-1

Index: wp-testdata/jacob/removes_accents_from_decomposable_latin1_supplement.input.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_decomposable_latin1_supplement.input.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_decomposable_latin1_supplement.input.txt	(working copy)
@@ -1 +0,0 @@
-
Index: wp-testdata/jacob/removes_accents_from_decomposable_latin1_supplement.output.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_decomposable_latin1_supplement.output.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_decomposable_latin1_supplement.output.txt	(working copy)
@@ -1 +0,0 @@
-AAAAAACEEEEIIIINOOOOOUUUUYaaaaaaceeeeiiiinooooouuuuyy
Index: wp-testdata/jacob/removes_accents_from_undecomposable_latin1_supplement.input.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_undecomposable_latin1_supplement.input.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_undecomposable_latin1_supplement.input.txt	(working copy)
@@ -1 +0,0 @@
-
Index: wp-testdata/jacob/removes_accents_from_undecomposable_latin1_supplement.output.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_undecomposable_latin1_supplement.output.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_undecomposable_latin1_supplement.output.txt	(working copy)
@@ -1 +0,0 @@
-AEDHOTHssaedhoth
Index: wp-testdata/jacob/removes_accents_from_latin_extended_a.input.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_latin_extended_a.input.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_latin_extended_a.input.txt	(working copy)
@@ -1 +0,0 @@
-AaAaAaCcCcCcCcDdEeEeEeEeEeGgGgGgGgHhIiIiIiIiIJjKkLlLlLlNnNnNnOoOoOoRrRrRrSsSsSs��TtTtUuUuUuUuUuUuWwYy�ZzZz��??????
Index: wp-testdata/jacob/removes_accents_from_latin_extended_a.output.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_latin_extended_a.output.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_latin_extended_a.output.txt	(working copy)
@@ -1 +0,0 @@
-AaAaAaCcCcCcCcDdEeEeEeEeEeGgGgGgGgHhIiIiIiIiIJjKkLlLlLlNnNnNnOoOoOoRrRrRrSsSsSsSsTtTtUuUuUuUuUuUuWwYyYZzZzZzIJijLlNs
Index: wp-testdata/jacob/removes_accents_from_latin1_supplement_and_latin_extended_a.input.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_latin1_supplement_and_latin_extended_a.input.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_latin1_supplement_and_latin_extended_a.input.txt	(working copy)
@@ -1 +0,0 @@
-��������������������������������������������������������������AaAaAaCcCcCcCcDdEeEeEeEeEeGgGgGgGgHhIiIiIiIiIJjKkLlLlLlNnNnNnOoOoOoRrRrRrSsSsSs��TtTtUuUuUuUuUuUuWwYy�ZzZz��??????
Index: wp-testdata/jacob/removes_accents_from_latin1_supplement_and_latin_extended_a.output.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_latin1_supplement_and_latin_extended_a.output.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_latin1_supplement_and_latin_extended_a.output.txt	(working copy)
@@ -1 +0,0 @@
-AAAAAACEEEEIIIINOOOOOUUUUYaaaaaaceeeeiiiinooooouuuuyyAEDHOTHssaedhothAaAaAaCcCcCcCcDdEeEeEeEeEeGgGgGgGgHhIiIiIiIiIJjKkLlLlLlNnNnNnOoOoOoRrRrRrSsSsSsSsTtTtUuUuUuUuUuUuWwYyYZzZzZzIJijLlNs
Index: wp-testdata/jacob/removes_accents_from_decomposable_latin_extended_a.input.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_decomposable_latin_extended_a.input.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_decomposable_latin_extended_a.input.txt	(working copy)
@@ -1 +0,0 @@
-AaAaAaCcCcCcCcDdEeEeEeEeEeGgGgGgGgHhIiIiIiIiIJjKkLlLlLlNnNnNnOoOoOoRrRrRrSsSsSs��TtTtUuUuUuUuUuUuWwYy�ZzZz��
Index: wp-testdata/jacob/removes_accents_from_latin1_supplement.input.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_latin1_supplement.input.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_latin1_supplement.input.txt	(working copy)
@@ -1 +0,0 @@
-
Index: wp-testdata/jacob/removes_accents_from_latin1_supplement.output.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_latin1_supplement.output.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_latin1_supplement.output.txt	(working copy)
@@ -1 +0,0 @@
-AAAAAACEEEEIIIINOOOOOUUUUYaaaaaaceeeeiiiinooooouuuuyyAEDHOTHssaedhoth
Index: wp-testdata/jacob/removes_accents_from_decomposable_latin_extended_a.output.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_decomposable_latin_extended_a.output.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_decomposable_latin_extended_a.output.txt	(working copy)
@@ -1 +0,0 @@
-AaAaAaCcCcCcCcDdEeEeEeEeEeGgGgGgGgHhIiIiIiIiIJjKkLlLlLlNnNnNnOoOoOoRrRrRrSsSsSsSsTtTtUuUuUuUuUuUuWwYyYZzZzZz
Index: wp-testdata/jacob/removes_accents_from_undecomposable_latin_extended_a.input.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_undecomposable_latin_extended_a.input.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_undecomposable_latin_extended_a.input.txt	(working copy)
@@ -1 +0,0 @@
-??????
Index: wp-testdata/jacob/removes_accents_from_undecomposable_latin_extended_a.output.txt
===================================================================
--- wp-testdata/jacob/removes_accents_from_undecomposable_latin_extended_a.output.txt	(revision 444)
+++ wp-testdata/jacob/removes_accents_from_undecomposable_latin_extended_a.output.txt	(working copy)
@@ -1 +0,0 @@
-IJijLlNs