===================================================================
RCS file: /cvs/mandoc/gmdiff,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- mandoc/gmdiff	2013/06/22 08:54:13	1.1
+++ mandoc/gmdiff	2017/06/02 12:43:52	1.7
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -19,17 +19,36 @@ if [ `id -u` -eq 0 ]; then
 fi
 
 if [ $# -eq 0 ]; then
-  echo "usage: $0 manual_source_file ..."
+  echo "usage: $0 [-h] manual_source_file ..."
   exit 1
 fi
 
+if [ "X$1" = "X-h" ]; then
+  shift
+  export PATH="/usr/local/heirloom-doctools/bin:$PATH"
+  EQN="neqn"
+  ROFF="nroff"
+  MOPT="-Omdoc $MOPT"
+elif [ "X$1" = "X-u" ]; then
+  shift
+  ROFF="groff -ket -ww -Tutf8 -P -c"
+  MOPT="-Werror -Tutf8 $MOPT"
+else
+  ROFF="groff -et -ww -Tascii -P -c"
+  MOPT="-Werror -Tascii $MOPT"
+fi
+
 while [ -n "$1" ]; do
   file=$1
   shift
   echo " ========== $file ========== "
-  tbl $file | groff -mandoc -Tascii -P -c 2>&1 > /tmp/groff.out
-  mandoc -Ios='OpenBSD ports' -Werror $file 2>&1 > /tmp/mandoc.out
-  diff -au /tmp/groff.out /tmp/mandoc.out 2>&1
+  $ROFF -mandoc $file 2> /tmp/roff.err > /tmp/roff.out
+  ${MANDOC:=mandoc} -Ios='OpenBSD ports' $MOPT $file \
+    2> /tmp/mandoc.err > /tmp/mandoc.out
+  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
 done
 
 exit 0