--- a/src/cm/media/css/base.css	Tue Aug 03 18:34:14 2010 +0200
+++ b/src/cm/media/css/base.css	Thu Aug 19 13:19:24 2010 +0200
@@ -166,8 +166,15 @@
 	border: medium none;
 	border-spacing: 4px;
 	width: 98%;
+	table-layout:fixed;
 }
 
+table.diff tr td div {
+	overflow:auto;
+	word-wrap:break-word;
+}
+
+
 table.diff th,table.diff td {
 	border: 1px solid transparent;
 	padding: 0.1em;
@@ -175,6 +182,7 @@
 
 .diff-title {
 	font-size:140%;
+	/*width: 98%;*/
 }
 
 .diff-author {
@@ -187,31 +195,39 @@
 	/*font-weight: bold;*/
 }
 
+table.diff col.diff-content {
+	width: 42%;
+}
+
+table.diff col.diff-marker {
+	width: 2%;
+}
+
+table.diff col.diff-separator {
+	width: 2%;
+}
+
 .diff-context {
 	background-color: #EEEEEE;
-	width: 42%;
+	/*width: 42%;*/
 	vertical-align: top; 
 }
 
 .diff-addedline {
 	background-color: #CCFFCC;
-	width: 42%;
+	/*width: 42%;*/
 	vertical-align: top; 
 }
 
 .diff-marker {
 	font-size: 120%;
 	text-align: center;
-	width: 5%;
 }
 
-.diff-separator {
-	width: 5%;
-}
 
 .diff-deletedline {
 	background-color: #FFFFAA;
-	width: 42%;
+	/*width: 42%;*/
 	vertical-align: top; 
 }
 

--- a/src/cm/views/texts.py	Tue Aug 03 18:34:14 2010 +0200
+++ b/src/cm/views/texts.py	Thu Aug 19 13:19:24 2010 +0200
@@ -564,7 +564,7 @@
     """
     gen = unified_diff(text1.split('\n'), text2.split('\n'), n=3)
     index = 0
-    res = ['<table class="diff"><tbody>']
+    res = ['<table class="diff"><col class="diff-marker"/><col class="diff-content"/><col class="diff-separator"/<col class="diff-marker"/><col class="diff-content"/><tbody>']
     res.append('<tr><td></td><td class="diff-title">%s</td><td></td><td></td><td class="diff-title">%s</td></tr>' %(title1, title2))
     res.append('<tr><td></td><td class="diff-author">%s</td><td></td><td></td><td class="diff-author">%s</td></tr>' %(author1, author2))
     res.append('<tr><td colspan="5"></td></tr>')
@@ -603,7 +603,7 @@
                 p = dif.diff_prettyHtml_one_way(res_diff1, 1)
                 minus = dif.diff_prettyHtml_one_way(res_diff1, 2)
                 plus = p
-                res.append('<tr><td class="diff-marker">-</td><td class="diff-deletedline">%s</td><td class="diff-separator"></td><td class="diff-marker">+</td><td class="diff-addedline">%s</td></tr>' % (minus, plus))
+                res.append('<tr><td class="diff-marker">-</td><td class="diff-deletedline"><div>%s</div></td><td class="diff-separator"></td><td class="diff-marker">+</td><td class="diff-addedline"><div>%s</div></td></tr>' % (minus, plus))
              
         index += 1
     res.append('</tbody></table>')