fix crlf problem; update doc and test make targets

Makefile

@@ -1,6 +1,8 @@
 # Makefile for testing
 
-.PHONY: dogfood test git svn
+TESTS = git svn crlf
+
+.PHONY: dogfood test $(TESTS)
 
 dogfood:
 	git diff | src/cdiff.py
@@ -8,9 +10,9 @@ dogfood:
 	git diff | src/cdiff.py -s -w 60
 	git diff | src/cdiff.py -s -w 90
 
-test: git svn
+test: $(TESTS)
 
-git svn:
+$(TESTS):
 	src/cdiff.py tests/$@.diff
 	src/cdiff.py tests/$@.diff -s
 	src/cdiff.py tests/$@.diff | diff -u tests/$@.diff -

README.md

@@ -18,8 +18,8 @@ whatever directory which is in your `$PATH`, for example, `$HOME/bin` is in my
 ## Usage
     
 Just give it a diff (patch) file or pipe a diff to it.  Use option `-s` for
-side-by-side view, and option `-w` to use text width other than default `80`.
-See examples below
+side-by-side view, and option `-w <N>` to use text width other than default
+`80`.  See examples below
 
 View a diff (patch) file:
 

src/cdiff.py

@@ -131,7 +131,7 @@ class Diff(object):
     def markup_side_by_side(self, width):
         """Returns a generator"""
         def _normalize(line):
-            return line.replace('\t', ' ' * 8).replace('\n', '')
+            return line.replace('\t', ' '*8).replace('\n', '').replace('\r', '')
 
         def _fit_width(markup, width, pad=False):
             """str len does not count correctly if left column contains ansi

tests/crlf.diff

@@ -0,0 +1,30 @@
+Index: README.md
+===================================================================
+--- README.md	(revision 41)
++++ README.md	(working copy)
+@@ -3,7 +3,6 @@
+ ## About
+ 
+ Coderev is a toolkit generates static side-by-side html pages for code review.
+-Typical use case is to generate diff pages for local modification in svn/cvs
+ workspace and send page link to teammates for code review.
+ 
+ See [joyus.org/pub/coderev-demo](http://joyus.org/pub/coderev-demo) for a demo.
+@@ -18,9 +17,10 @@
+ 
+ ## Usage of coderev.sh
+ 
+-Just type `./coderev.sh -h` to see the usage.
++Just type `./coderev.sh --help` to see the usage.
+ 
+     Usage:
++
+         coderev.sh [-r revision] [-w width] [-o outdir] [-y] [-d name] \
+                 [-F comment-file | -m 'comment...'] [file...]
+ 
+@@ -145,3 +145,5 @@
+                             specify column number where lines are broken and
+                             wrapped for sdiff, default is no line wrapping
+     -y, --yes             do not prompt for overwriting
++
++# EOF