From b70e20257c973d3a0df15d4198a60cc54b7a3af0 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 3 Jun 2011 13:45:11 +0000
Subject: [PATCH] Don't use col(1) since grotty(1) never outputs reverse line
 feeds, and because col(1) mangles ANSI color escapes if enabled.  Spaces to
 tabs compression is now done by passing -h to grotty(1).

Discussed with:	uqs
---
 usr.bin/man/man.conf.5 |  3 +--
 usr.bin/man/man.sh     | 18 +++++-------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index fdbd69e05b78..24f8226d51e1 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 1, 2010
+.Dd June 3, 2011
 .Os
 .Dt MAN.CONF 5
 .Sh NAME
@@ -72,7 +72,6 @@ For pages in a given language, overriding the default toolset for
 display is supported via the following definitions:
 .Bl -tag -offset indent -compact
 .It EQN Ns _ Ns Va LANG
-.It COL Ns _ Ns Va LANG
 .It NROFF Ns _ Ns Va LANG
 .It PIC Ns _ Ns Va LANG
 .It TBL Ns _ Ns Va LANG
diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh
index 5905dc2abe0f..11a920635dd5 100755
--- a/usr.bin/man/man.sh
+++ b/usr.bin/man/man.sh
@@ -279,7 +279,7 @@ man_check_for_so() {
 # Usage: man_display_page
 # Display either the manpage or catpage depending on the use_cat variable
 man_display_page() {
-	local EQN COL NROFF PIC TBL TROFF REFER VGRIND
+	local EQN NROFF PIC TBL TROFF REFER VGRIND
 	local IFS l nroff_dev pipeline preproc_arg tool
 
 	# We are called with IFS set to colon. This causes really weird
@@ -347,7 +347,7 @@ man_display_page() {
 		# Allow language specific calls to override the default
 		# set of utilities.
 		l=$(echo $man_lang | tr [:lower:] [:upper:])
-		for tool in EQN COL NROFF PIC TBL TROFF REFER VGRIND; do
+		for tool in EQN NROFF PIC TBL TROFF REFER VGRIND; do
 			eval "$tool=\${${tool}_$l:-\$$tool}"
 		done
 		;;
@@ -368,7 +368,7 @@ man_display_page() {
 			g)	;; # Ignore for compatability.
 			p)	pipeline="$pipeline | $PIC" ;;
 			r)	pipeline="$pipeline | $REFER" ;;
-			t)	pipeline="$pipeline | $TBL"; use_col=yes ;;
+			t)	pipeline="$pipeline | $TBL" ;;
 			v)	pipeline="$pipeline | $VGRIND" ;;
 			*)	usage ;;
 			esac
@@ -377,19 +377,12 @@ man_display_page() {
 		pipeline="${pipeline#" | "}"
 	else
 		pipeline="$TBL"
-		use_col=yes
 	fi
 
 	if [ -n "$tflag" ]; then
 		pipeline="$pipeline | $TROFF"
 	else
-		pipeline="$pipeline | $NROFF"
-
-		if [ -n "$use_col" ]; then
-			pipeline="$pipeline | $COL"
-		fi
-
-		pipeline="$pipeline | $PAGER"
+		pipeline="$pipeline | $NROFF | $PAGER"
 	fi
 
 	if [ $debug -gt 0 ]; then
@@ -928,14 +921,13 @@ do_whatis() {
 
 # User's PATH setting decides on the groff-suite to pick up.
 EQN=eqn
-NROFF='groff -S -P-c -Wall -mtty-char -man'
+NROFF='groff -S -P-ch -Wall -mtty-char -man'
 PIC=pic
 REFER=refer
 TBL=tbl
 TROFF='groff -S -man'
 VGRIND=vgrind
 
-COL=/usr/bin/col
 LOCALE=/usr/bin/locale
 STTY=/bin/stty
 SYSCTL=/sbin/sysctl