Fix MarkupFixer, del files, mod headers

tests/MarkupFixerTest.php

@@ -4,10 +4,11 @@
  * PHP TableOfContents Library
  *
  * @license http://opensource.org/licenses/MIT
- * @link https://github.com/caseyamcl/toc
+ * @link https://github.com/igorvbelousov/toc
  * @version 1.0
- * @package caseyamcl/toc
+ * @package igorvbelousov/toc
  * @author Casey McLaughlin <caseyamcl@gmail.com>
+ * @author Igor V Belousov <igor@belousovv.ru>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -42,14 +43,30 @@ class MarkupFixerTest extends \PHPUnit_Framework_TestCase
 
     // ---------------------------------------------------------------
 
+    public function testFixAddsIdsW3C()
+    {
+        $obj = new MarkupFixer();
+
+        $html = "<h1>1 Number and ID</h1><h2>: 123</h2>";
+
+        $this->assertEquals(
+            '<h1 id="N-number-and-id">1 Number and ID</h1><h2 id="N23">: 123</h2>',
+            $obj->fix($html, 1, 2)
+        );
+    }
+
+    // ---------------------------------------------------------------
+
     public function testFixDoesNotDuplicateIdsWhenFixing()
     {
         $obj = new MarkupFixer();
 
-        $html = "<h1>FooBar</h1><h2>FooBar</h2><h3>FooBar</h3>";
+        $html = "<h1>FooBar</h1><h2>FooBar</h2><h3>FooBar</h3><div id='foobar'>
+</div>";
 
         $this->assertEquals(
-            '<h1 id="foobar">FooBar</h1><h2 id="foobar-1">FooBar</h2><h3 id="foobar-2">FooBar</h3>',
+            '<h1 id="foobar-1">FooBar</h1><h2 id="foobar-2">FooBar</h2><h3 id="foobar-3">FooBar</h3><div id=\'foobar\'>
+</div>',
             $obj->fix($html, 1, 3)
         );
     }
@@ -60,6 +77,20 @@ class MarkupFixerTest extends \PHPUnit_Framework_TestCase
     {
         $obj = new MarkupFixer();
 
+        $html = "<h1>No ID</h1><h2 title = 	'b'>Existing ID</h2><h3>Ignored</h3>";
+
+        $this->assertEquals(
+          '<h1 id="no-id">No ID</h1><h2 title = 	\'b\' id="b">Existing ID</h2><h3>Ignored</h3>',
+          $obj->fix($html, 1, 2)
+        );
+    }
+    
+    // ---------------------------------------------------------------
+
+    public function testFixUsesTitleAttributeWhenAvailableiWithOutTabs()
+    {
+        $obj = new MarkupFixer();
+
         $html = "<h1>No ID</h1><h2 title='b'>Existing ID</h2><h3>Ignored</h3>";
 
         $this->assertEquals(