chrisboulton · jdlx · Jul 6, 2011 · Jul 6, 2011 · Jul 6, 2011 · Jul 29, 2011
diff --git a/example/a.txt b/example/a.txt
@@ -1,13 +1,15 @@
 <html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-		<title>Hello World!</title>
-	</head>
-	<body>
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>Hello World!</title>
+  </head>
+  <body>
+    <p>Příliš žluťoučký kůň úpěl ďábelské ódy</p>
 
-		<h2>A heading we'll be removing</h2>
+    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-	</body>
+    <h2>A heading we'll be removing</h2>
+
+    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  </body>
 </html>
diff --git a/example/b.txt b/example/b.txt
@@ -1,14 +1,16 @@
 <html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-		<title>Goodbye Cruel World!</title>
-	</head>
-	<body>
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>Goodbye Cruel World!</title>
+  </head>
+  <body>
+    <p>Příliš žluťoučký kůň úpěl ďábelské ódy -- previous sentence is a pangram for Czech language (see http://en.wikipedia.org/wiki/Pangram)</p>
 
+    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 
-		<p>Just a small amount of new text...</p>
-	</body>
+    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+
+    <p>Just a small amount of new text...</p>
+  </body>
 </html>
diff --git a/example/example.php b/example/example.php
@@ -1,69 +1,80 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-		<title>PHP LibDiff - Examples</title>
-		<link rel="stylesheet" href="styles.css" type="text/css" charset="utf-8"/>
-	</head>
-	<body>
-		<h1>PHP LibDiff - Examples</h1>
-		<hr />
-		<?php
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>PHP LibDiff - Examples</title>
+    <?php
+    $theme = isset($_GET['theme']) ? $_GET['theme'] : 'default';
+    ?>
+    <link rel="stylesheet" href="themes/<?php echo $theme;?>/php-diff.css" type="text/css" charset="utf-8"/>
+  </head>
+  <body>
+    <h1>PHP LibDiff - Examples</h1>
+    <h3>Theme: |
+    <?php
+    $dirs = scandir(__dir__.'/themes/');
+    foreach($dirs as $theme_dir) {
+      if(is_dir(__dir__.'/themes/'.$theme_dir) && $theme_dir!='.' && $theme_dir!='..') {
+        echo '<a href="example.php?theme='.$theme_dir.'">'.$theme_dir.'</a> | ';
+      }
+    }
+    ?></h3>
+    <hr />
 
-		// Include the diff class
-		require_once dirname(__FILE__).'/../lib/Diff.php';
+    <?php
+    // Simple autoloader
+    function __autoload($class)
+    {
+      $libPath = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR;
+      require_once $libPath . str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+    }
 
-		// Include two sample files for comparison
-		$a = explode("\n", file_get_contents(dirname(__FILE__).'/a.txt'));
-		$b = explode("\n", file_get_contents(dirname(__FILE__).'/b.txt'));
+    // Include two sample files for comparison
+    $a = explode("\n", file_get_contents(dirname(__FILE__).'/a.txt'));
+    $b = explode("\n", file_get_contents(dirname(__FILE__).'/b.txt'));
 
-		// Options for generating the diff
-		$options = array(
-			//'ignoreWhitespace' => true,
-			//'ignoreCase' => true,
-		);
+    // Options for generating the diff
+    $options = array(
+      'context' => 1,
+      //'ignoreWhitespace' => true,
+      //'ignoreCase' => true,
+      //'title_a' => 'some other title than "Old Version"',
+      //'title_b' => 'some other title than "New Version"',
+    );
 
-		// Initialize the diff class
-		$diff = new Diff($a, $b, $options);
+    // Initialize the diff class
+    $diff = new Diff_Diff($a, $b, $options);
 
-		?>
-		<h2>Side by Side Diff</h2>
-		<?php
+    ?>
+    <h2>Side by Side Diff</h2>
+    <?php
 
-		// Generate a side by side diff
-		require_once dirname(__FILE__).'/../lib/Diff/Renderer/Html/SideBySide.php';
-		$renderer = new Diff_Renderer_Html_SideBySide;
-		echo $diff->Render($renderer);
+    // Generate a side by side diff
+    echo $diff->render('Html_SideBySide');
 
-		?>
-		<h2>Inline Diff</h2>
-		<?php
+    ?>
+    <h2>Inline Diff</h2>
+    <?php
 
-		// Generate an inline diff
-		require_once dirname(__FILE__).'/../lib/Diff/Renderer/Html/Inline.php';
-		$renderer = new Diff_Renderer_Html_Inline;
-		echo $diff->render($renderer);
+    // Generate an inline diff
+    echo $diff->render('Html_Inline');
 
-		?>
-		<h2>Unified Diff</h2>
-		<pre><?php
+    ?>
+    <h2>Unified Diff</h2>
+    <pre><?php
 
-		// Generate a unified diff
-		require_once dirname(__FILE__).'/../lib/Diff/Renderer/Text/Unified.php';
-		$renderer = new Diff_Renderer_Text_Unified;
-		echo htmlspecialchars($diff->render($renderer));
+    // Generate a unified diff
+    echo htmlspecialchars($diff->render('Text_Unified'));
 
-		?>
-		</pre>
-		<h2>Context Diff</h2>
-		<pre><?php
+    ?>
+    </pre>
+    <h2>Context Diff</h2>
+    <pre><?php
 
-		// Generate a context diff
-		require_once dirname(__FILE__).'/../lib/Diff/Renderer/Text/Context.php';
-		$renderer = new Diff_Renderer_Text_Context;
-		echo htmlspecialchars($diff->render($renderer));
-		?>
-		</pre>
-	</body>
+    // Generate a context diff
+    echo htmlspecialchars($diff->render('Text_Context'));
+    ?>
+    </pre>
+  </body>
 </html>
diff --git a/example/styles.css → example/themes/default/php-diff.css b/example/styles.css → example/themes/default/php-diff.css
diff --git a/example/themes/default/screenshot.png b/example/themes/default/screenshot.png
diff --git a/example/themes/jdlx/context-break.png b/example/themes/jdlx/context-break.png
diff --git a/example/themes/jdlx/php-diff.css b/example/themes/jdlx/php-diff.css
@@ -0,0 +1,134 @@
+/**
+* php-diff theme jdlx
+* @author http://rexdev.de
+* @see https://github.com/jdlx
+*/
+
+body {
+  background: none repeat scroll 0 0 silver;
+  font-family: Lucida Grande,Helvetica,Arial,sans-serif;
+  font-size: 12px;
+  color:#404040;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
+  margin: 0;
+  padding: 10px;
+  }
+hr {
+  height:0;
+  background:none;
+  border:0;
+  border-bottom:1px solid gray;
+  box-shadow: 0 3px 4px rgba(0, 0, 0, 1);
+  margin:20px 0 20px 0;
+  }
+#Info-Block {
+  margin-left: 4.5em;
+  }
+.Differences {
+  border-collapse: collapse;
+  border-spacing: 0;
+  empty-cells: show;
+  width: 100%;
+  border-radius: 4px 4px 4px 4px;
+  box-shadow: 0 1px 10px rgba(0, 0, 0, 0.8);
+  color:black;
+  }
+.Differences thead {
+  background: url("top-edge.png") repeat-x scroll 0 100% #efefef;
+  }
+.Differences tbody {
+  background: none repeat scroll 0 0 white;
+  }
+.Differences thead th {
+  color: #000000;
+  height: 3em;
+  padding-left: 4.5em;
+  text-align: left;
+  }
+.Differences tbody th {
+  background: none repeat scroll 0 0 #ECECEC;
+  border-bottom: 1px solid silver;
+  border-right: 1px solid #CFCFCF;
+  color: silver;
+  font-size: 12px;
+  padding: 1px 2px;
+  text-align: right;
+  vertical-align: top;
+  width: 4em;
+  }
+.Differences tbody.Skipped th {
+  border-right: 0 none;
+  }
+.Differences td {
+  font-family: monospace;
+  font-size: 12px;
+  padding: 1px 2px;
+  }
+.Differences tbody.ChangeReplace {
+  border-bottom: 1px solid #A0B9E3;
+  border-top: 1px solid #A0B9E3;
+  }
+.Differences tbody.ChangeInsert {
+  background: url("shadow.png") repeat-x scroll 0 0 transparent;
+  }
+.Differences tbody.ChangeDelete {
+  background: url("shadow.png") repeat-x scroll 0 0 transparent;
+  }
+.DifferencesSideBySide .ChangeInsert td.Left {
+  }
+.DifferencesSideBySide .ChangeInsert td.Right {
+  background: none repeat scroll 0 0 #CCFFCC;
+  }
+.DifferencesSideBySide .ChangeDelete td.Left {
+  background: none repeat scroll 0 0 #F9DADA;
+  }
+.DifferencesSideBySide .ChangeDelete td.Right {
+  }
+.DifferencesSideBySide .ChangeReplace .Left {
+  background: none repeat scroll 0 0 #F1F4FA;
+  }
+.DifferencesSideBySide .ChangeReplace .Right {
+  background: none repeat scroll 0 0 #F1F4FA;
+  }
+.Differences ins, .Differences del {
+  text-decoration: none;
+  }
+.DifferencesSideBySide .ChangeReplace ins, .DifferencesSideBySide .ChangeReplace del {
+  background: none repeat scroll 0 0 #C8D5ED;
+  }
+.Differences .Skipped {
+  background: url("context-break.png") repeat-x scroll 0 50% white;
+  height: 30px;
+  }
+.Differences .Skipped tr th {
+  background-color: #ECECEC;
+  opacity: 0;
+  }
+.DifferencesInline .ChangeReplace .Left, .DifferencesInline .ChangeDelete .Left {
+  background: none repeat scroll 0 0 #FFDDDD;
+  }
+.DifferencesInline .ChangeReplace .Right, .DifferencesInline .ChangeInsert .Right {
+  background: none repeat scroll 0 0 #DDFFDD;
+  }
+.DifferencesInline .ChangeReplace ins {
+  background: none repeat scroll 0 0 #99EE99;
+  }
+.DifferencesInline .ChangeReplace del {
+  background: none repeat scroll 0 0 #EE9999;
+  }
+pre {
+  overflow: auto;
+  width: 98%;
+  background:#fff;
+  color:#000;
+  padding:1%;
+  border-radius: 4px 4px 4px 4px;
+  box-shadow: 0 1px 10px rgba(0, 0, 0, 0.8);
+  }
+h2 {
+  margin-top:30px;
+  }
+a,a:visited {
+  color:#d11803;
+  text-decoration:none;
+  }
diff --git a/example/themes/jdlx/screenshot.png b/example/themes/jdlx/screenshot.png
diff --git a/example/themes/jdlx/shadow.png b/example/themes/jdlx/shadow.png
diff --git a/example/themes/jdlx/top-edge.png b/example/themes/jdlx/top-edge.png