? .DS_Store
? article.inc
? audio.inc
? video.inc
? webcam.inc
Index: DiffEngine.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/diff/DiffEngine.php,v
retrieving revision 1.1.4.1
diff -U3 -r1.1.4.1 DiffEngine.php
--- DiffEngine.php	6 Jun 2007 18:14:25 -0000	1.1.4.1
+++ DiffEngine.php	5 Dec 2007 17:05:34 -0000
@@ -1060,17 +1060,17 @@
 
 	# HTML-escape parameter before calling this
 	function addedLine( $line ) {
-		return "<td>+</td><td class='diff-addedline'>{$line}</td>";
+		return "<td>+</td><td class='diff-addedline'><div>{$line}</div></td>";
 	}
 
 	# HTML-escape parameter before calling this
 	function deletedLine( $line ) {
-		return "<td>-</td><td class='diff-deletedline'>{$line}</td>";
+		return "<td>-</td><td class='diff-deletedline'><div>{$line}</div></td>";
 	}
 
 	# HTML-escape parameter before calling this
 	function contextLine( $line ) {
-		return "<td> </td><td class='diff-context'>{$line}</td>";
+		return "<td> </td><td class='diff-context'><div>{$line}</div></td>";
 	}
 
 	function emptyLine() {
Index: diff.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/diff/diff.css,v
retrieving revision 1.2.2.3
diff -U3 -r1.2.2.3 diff.css
--- diff.css	31 Jan 2007 18:05:55 -0000	1.2.2.3
+++ diff.css	5 Dec 2007 17:05:34 -0000
@@ -1,8 +1,10 @@
 /* $Id: diff.css,v 1.2.2.3 2007/01/31 18:05:55 dww Exp $ */
 
 table.diff {
-  width: 100%;
+  border-spacing: 4px;
   margin-bottom: 20px;
+  table-layout: fixed;
+  width: 100%;
 }
 td.diff-prevlink {
   text-align: left;
@@ -31,3 +33,26 @@
   color: #f00;
   font-weight: bold;
 }
+
+table.diff col.diff-marker {
+  width: 1em;
+}
+table.diff col.diff-content {
+  width: 48%;
+}
+table.diff th {
+  padding-right: inherit;
+}
+table.diff td div {
+  overflow: auto;
+  padding: 0.1ex 0.5em;
+  word-wrap: break-word;
+}
+table.diff td {
+  font-size: 79%;
+  padding: 0.1ex 0.4em;
+}
+table.diff td.diff-deletedline, table.diff td.diff-addedline, table.diff td.diff-context {
+  font-family: courier, serif;
+  padding: 0;
+}
Index: diff.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/diff/diff.module,v
retrieving revision 1.8.2.8
diff -U3 -r1.8.2.8 diff.module
--- diff.module	6 Jun 2007 18:14:25 -0000	1.8.2.8
+++ diff.module	5 Dec 2007 17:05:35 -0000
@@ -322,6 +322,7 @@
 
   // display table
   $output .= '<table class="diff">';
+  $output .= '<col class="diff-marker" /><col class="diff-content" /><col class="diff-marker" /><col class="diff-content" />';
   $output .= '<thead><tr><th></th><th>'. $old_header .'</th><th></th><th>'. $new_header .'</th></tr></thead>';
   if ($new_log || $old_log) {
     $output .= '<tr><td></td><td>'. $old_log .'</td><td></td><td>'. $new_log .'</td></tr>';
@@ -368,7 +369,7 @@
     }
     $formatter_output = $formatter->format($diff);
     if ($formatter_output) {
-      $output .= '<tr><td colspan="4" class="diff-section-title">'. t('Changes to %name', array('%name' => $node_diff['name'])) .'</td></tr>';
+      $output .= '<tr><td colspan="4" class="diff-section-title">'. t('Changes to !name', array('!name' => $node_diff['name'])) .'</td></tr>';
       $output .= $formatter_output;
       $any_visible_change = true;
     }
@@ -479,6 +480,7 @@
   if ($op == t('Preview changes')) {
     $node = (object)$form_values;
     $changes  = '<table class="diff">';
+    $changes .= '<col class="diff-marker" /><col class="diff-content" /><col class="diff-marker" /><col class="diff-content" />';
     $changes .= _diff_table_body(node_load($form_values['nid']), $node);
     $changes .= '</table>';
     $form['#prefix'] = isset($form['#prefix']) ? $changes . $form['#prefix'] : $changes;