# HG changeset patch
# User raph
# Date 1271406894 -7200
# Node ID 94afd8e00c74ab93e4634156192a445e5ed1b314
# Parent  a844469257b0d98caa28a8f26f6643eb1bd489d0
cleanup diff for human reading

diff -r a844469257b0 -r 94afd8e00c74 src/cm/media/css/base.css
--- a/src/cm/media/css/base.css	Thu Apr 15 17:21:59 2010 +0200
+++ b/src/cm/media/css/base.css	Fri Apr 16 10:34:54 2010 +0200
@@ -189,6 +189,8 @@
 
 .diff-context {
 	background-color: #EEEEEE;
+	width: 42%;
+	vertical-align: top; 
 }
 
 .diff-addedline {
diff -r a844469257b0 -r 94afd8e00c74 src/cm/views/texts.py
--- a/src/cm/views/texts.py	Thu Apr 15 17:21:59 2010 +0200
+++ b/src/cm/views/texts.py	Fri Apr 16 10:34:54 2010 +0200
@@ -597,8 +597,10 @@
                 
                 minus, plus = '<br />'.join(minus), '<br />'.join(plus)                
                 dif = diff_match_patch2()
-                p = dif.diff_prettyHtml_one_way(dif.diff_main(minus, plus), 1)
-                minus = dif.diff_prettyHtml_one_way(dif.diff_main(minus, plus), 2)
+                res_diff1 = dif.diff_main(minus, plus)
+                dif.diff_cleanupSemantic(res_diff1)
+                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))