Finish the HTML Combined renderer

Author: jfcherng

.phpstorm.meta.php

@@ -14,19 +14,25 @@
 override(
     \Jfcherng\Diff\Factory\RendererFactory::getInstance(0),
     map([
+        // html
+        'Combined' => \Jfcherng\Diff\Renderer\Html\Combined::class,
         'Inline' => \Jfcherng\Diff\Renderer\Html\Inline::class,
         'Json' => \Jfcherng\Diff\Renderer\Html\Json::class,
         'SideBySide' => \Jfcherng\Diff\Renderer\Html\SideBySide::class,
+        // text
         'Context' => \Jfcherng\Diff\Renderer\Text\Context::class,
         'Unified' => \Jfcherng\Diff\Renderer\Text\Unified::class,
     ])
 );
 override(
     \Jfcherng\Diff\Factory\RendererFactory::make(0),
     map([
+        // html
+        'Combined' => \Jfcherng\Diff\Renderer\Html\Combined::class,
         'Inline' => \Jfcherng\Diff\Renderer\Html\Inline::class,
         'Json' => \Jfcherng\Diff\Renderer\Html\Json::class,
         'SideBySide' => \Jfcherng\Diff\Renderer\Html\SideBySide::class,
+        // text
         'Context' => \Jfcherng\Diff\Renderer\Text\Context::class,
         'Unified' => \Jfcherng\Diff\Renderer\Text\Unified::class,
     ])

README.md

@@ -23,6 +23,7 @@ Generated diff can be rendered in all of the standard formats including:
 
 **HTML** renderers:
 
+- Combined
 - Inline
 - Side by Side
 
@@ -69,7 +70,7 @@ $new = 'And this is the new one.';
 
 // renderer class name:
 //     Text renderers: Context, Json, Unified
-//     HTML renderers: Inline, SideBySide
+//     HTML renderers: Combined, Inline, SideBySide
 $rendererName = 'Unified';
 
 // the Diff class options
@@ -171,6 +172,15 @@ $result = $htmlRenderer->renderArray(json_decode($jsonResult, true));
 ![Side By Side](https://raw.githubusercontent.com/jfcherng/php-diff/v6/example/images/side-by-side-renderer.png)
 
 
+### Renderer: Combined
+
+```php
+<?php $rendererOptions = ['detailLevel' => 'char'];
+```
+
+![Combined](https://raw.githubusercontent.com/jfcherng/php-diff/v6/example/images/combined-renderer-char-level.png)
+
+
 ### Renderer: Unified
 
 ```diff

example/images/combined-renderer-char-level.png

@@ -16,5 +16,4 @@ B
 Donec rutrum test.
 There is a new inserted line.
 C
-gravida aliquet test.
-Sed dictum test.
+Sed dolor lorem ipsum hendrerit.

example/new_file.txt

@@ -15,5 +15,4 @@ Just a context separator. 2
 B
 Donec rutrum.
 C
-Sed dictum.
-gravida aliquet.
+Sed dictum lorem ipsum.