diff options
author | Ruslan Ermilov <ru@FreeBSD.org> | 2011-06-03 13:45:11 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@FreeBSD.org> | 2011-06-03 13:45:11 +0000 |
commit | b70e20257c973d3a0df15d4198a60cc54b7a3af0 (patch) | |
tree | 1aff5e3af02284ea2a2cae5da0b31c804c94dfe9 /usr.bin/man/man.sh | |
parent | 0829f5978bcd8456082b6e4f521c86705cc4690b (diff) | |
download | src-test2-b70e20257c973d3a0df15d4198a60cc54b7a3af0.tar.gz src-test2-b70e20257c973d3a0df15d4198a60cc54b7a3af0.zip |
Notes
Diffstat (limited to 'usr.bin/man/man.sh')
-rwxr-xr-x | usr.bin/man/man.sh | 18 |
1 files changed, 5 insertions, 13 deletions
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 |