process UTF-8 input even in ASCII output mode,

and provide a way to specify additional diff(1) options

diff --git a/gmdiff b/gmdiff
index 65cf353daa0c0af418d220b59150a817a8e47751..69431f703aaf5508c5bf51a453084c3a7307becc 100644 (file)
--- a/gmdiff
+++ b/gmdiff
@@ -36,7 +36,7 @@ elif [ "X$1" = "X-u" ]; then
   MOPT="-Ios=OpenBSD -Wall -Tutf8 $MOPT"
   COLPIPE="cat"
 else
-  ROFF="groff -et -ww -mtty-char -Tascii -P -c"
+  ROFF="groff -ket -ww -mtty-char -Tascii -P -c"
   MOPT="-Ios=OpenBSD -Wall -Tascii $MOPT"
   COLPIPE="cat"
 fi
@@ -51,7 +51,7 @@ while [ -n "$1" ]; do
   for i in roff mandoc; do
     [ -s /tmp/$i.err ] && echo "$i errors:" && cat /tmp/$i.err
   done
-  diff -au /tmp/roff.out /tmp/mandoc.out 2>&1
+  diff -au $DIFFOPT /tmp/roff.out /tmp/mandoc.out 2>&1
 done
 
 exit 0