Refactor MakeWellFormed/Injector for performance and as little code duplication as possible. Also, make AutoParagraph smarter about root nodes that don't like p tags.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1221 48356398-32a2-884e-a903-53898d9a118a

tests/HTMLPurifier/Strategy/MakeWellFormedTest.php

@@ -175,6 +175,14 @@ Par
             '<p>Par</p>'
         );
         
+        $this->assertResult(
+'Par
+
+Par2',
+            true,
+            array('Core.AutoParagraph' => true, 'HTML.Parent' => 'span')
+        );
+        
     }
     
     function testLinkify() {