diff --git a/lib/Diff/Renderer/Html/SideBySide.php b/lib/Diff/Renderer/Html/SideBySide.php
index 307af1c3..dfe8cad8 100644
--- a/lib/Diff/Renderer/Html/SideBySide.php
+++ b/lib/Diff/Renderer/Html/SideBySide.php
@@ -75,42 +75,56 @@ public function render()
}
foreach($blocks as $change) {
- $html .= '
';
// Equal changes should be shown on both sides of the diff
if($change['tag'] == 'equal') {
foreach($change['base']['lines'] as $no => $line) {
$fromLine = $change['base']['offset'] + $no + 1;
$toLine = $change['changed']['offset'] + $no + 1;
- $html .= '';
- $html .= ''.$fromLine.' | ';
- $html .= ''.$line.' | ';
- $html .= ''.$toLine.' | ';
- $html .= ''.$line.' | ';
- $html .= '
';
+
+ $html .= '';
+
+ $html .= '';
+ $html .= ''.$fromLine.' | ';
+ $html .= ''.$line.' | ';
+ $html .= ''.$toLine.' | ';
+ $html .= ''.$line.' | ';
+ $html .= '
';
+
+ $html .= '';
}
}
// Added lines only on the right side
else if($change['tag'] == 'insert') {
foreach($change['changed']['lines'] as $no => $line) {
$toLine = $change['changed']['offset'] + $no + 1;
- $html .= '';
- $html .= ' | ';
- $html .= ' | ';
- $html .= ''.$toLine.' | ';
- $html .= ''.$line.' | ';
- $html .= '
';
+
+ $html .= '';
+
+ $html .= '';
+ $html .= ' | ';
+ $html .= ' | ';
+ $html .= ''.$toLine.' | ';
+ $html .= ''.$line.' | ';
+ $html .= '
';
+
+ $html .= '';
}
}
// Show deleted lines only on the left side
else if($change['tag'] == 'delete') {
foreach($change['base']['lines'] as $no => $line) {
$fromLine = $change['base']['offset'] + $no + 1;
- $html .= '';
- $html .= ''.$fromLine.' | ';
- $html .= ''.$line.' | ';
- $html .= ' | ';
- $html .= ' | ';
- $html .= '
';
+
+ $html .= '';
+
+ $html .= '';
+ $html .= ''.$fromLine.' | ';
+ $html .= ''.$line.' | ';
+ $html .= ' | ';
+ $html .= ' | ';
+ $html .= '
';
+
+ $html .= '';
}
}
// Show modified lines on both sides
@@ -118,20 +132,25 @@ public function render()
if(count($change['base']['lines']) >= count($change['changed']['lines'])) {
foreach($change['base']['lines'] as $no => $line) {
$fromLine = $change['base']['offset'] + $no + 1;
- $html .= '';
- $html .= ''.$fromLine.' | ';
- $html .= ''.$line.' | ';
- if(!isset($change['changed']['lines'][$no])) {
- $toLine = ' ';
- $changedLine = ' ';
- }
- else {
- $toLine = $change['base']['offset'] + $no + 1;
- $changedLine = ''.$change['changed']['lines'][$no].'';
- }
- $html .= ''.$toLine.' | ';
- $html .= ''.$changedLine.' | ';
- $html .= '
';
+
+ $html .= '';
+
+ $html .= '';
+ $html .= ''.$fromLine.' | ';
+ $html .= ''.$line.' | ';
+ if(!isset($change['changed']['lines'][$no])) {
+ $toLine = ' ';
+ $changedLine = ' ';
+ }
+ else {
+ $toLine = $change['base']['offset'] + $no + 1;
+ $changedLine = ''.$change['changed']['lines'][$no].'';
+ }
+ $html .= ''.$toLine.' | ';
+ $html .= ''.$changedLine.' | ';
+ $html .= '
';
+
+ $html .= '';
}
}
else {
@@ -144,20 +163,24 @@ public function render()
$fromLine = $change['base']['offset'] + $no + 1;
$line = ''.$change['base']['lines'][$no].'';
}
- $html .= '';
- $html .= ''.$fromLine.' | ';
- $html .= ''.$line.' | ';
- $toLine = $change['changed']['offset'] + $no + 1;
- $html .= ''.$toLine.' | ';
- $html .= ''.$changedLine.' | ';
- $html .= '
';
+
+ $html .= '';
+
+ $html .= '';
+ $html .= ''.$fromLine.' | ';
+ $html .= ''.$line.' | ';
+ $toLine = $change['changed']['offset'] + $no + 1;
+ $html .= ''.$toLine.' | ';
+ $html .= ''.$changedLine.' | ';
+ $html .= '
';
+
+ $html .= '';
}
}
}
- $html .= '';
}
}
$html .= '';
return $html;
}
-}
\ No newline at end of file
+}