Date: Fri, 3 Jun 2011 13:45:11 +0000 (UTC) From: Ruslan Ermilov <ru@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r222650 - head/usr.bin/man Message-ID: <201106031345.p53DjBWc066350@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ru Date: Fri Jun 3 13:45:11 2011 New Revision: 222650 URL: http://svn.freebsd.org/changeset/base/222650 Log: 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 Modified: head/usr.bin/man/man.conf.5 head/usr.bin/man/man.sh Modified: head/usr.bin/man/man.conf.5 ============================================================================== --- head/usr.bin/man/man.conf.5 Fri Jun 3 13:12:26 2011 (r222649) +++ head/usr.bin/man/man.conf.5 Fri Jun 3 13:45:11 2011 (r222650) @@ -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, overridin 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 Modified: head/usr.bin/man/man.sh ============================================================================== --- head/usr.bin/man/man.sh Fri Jun 3 13:12:26 2011 (r222649) +++ head/usr.bin/man/man.sh Fri Jun 3 13:45:11 2011 (r222650) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106031345.p53DjBWc066350>