diff options
author | ru <ru@FreeBSD.org> | 2011-06-03 13:45:11 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2011-06-03 13:45:11 +0000 |
commit | affb6a9a2246d9d1e89a3ef4b4e00cd899aa1e0a (patch) | |
tree | 1aff5e3af02284ea2a2cae5da0b31c804c94dfe9 /usr.bin | |
parent | c78f027a996f81d7db92d47776ce536e0723b3bc (diff) | |
download | FreeBSD-src-affb6a9a2246d9d1e89a3ef4b4e00cd899aa1e0a.zip FreeBSD-src-affb6a9a2246d9d1e89a3ef4b4e00cd899aa1e0a.tar.gz |
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
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/man/man.conf.5 | 3 | ||||
-rwxr-xr-x | 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 fdbd69e..24f8226 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 5905dc2..11a9206 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 |