Nick, as promised earlier, here is my patch for updating Pod::Perldoc in 5.8.1 to version 3.11. I'll send a similar patch for I18N::LangTags in a separate message. Note: the change to perldoc.PL comes from an earlier update to the module and seems to have been missed before. I guess only Sean would care about it anyways. :) Cheers, -Jan Change 79875 by jand on 2003/10/17 17:11:03 Update Pod::Perldoc from 3.10 to 3.11 Affected files ... ... lib/Pod/Perldoc.pm#2 edit ... lib/Pod/Perldoc/ToMan.pm#2 edit ... pod/perldoc.pod#2 edit ... utils/perldoc.PL#17 edit Differences ... ==== lib/Pod/Perldoc.pm#2 (text) ==== Index: lib/Pod/Perldoc.pm --- lib/Pod/Perldoc.pm.~1~ Wed Oct 22 20:08:57 2003 +++ lib/Pod/Perldoc.pm Wed Oct 22 20:08:57 2003 @@ -12,7 +12,7 @@ use vars qw($VERSION @Pagers $Bindir $Pod2man $Temp_Files_Created $Temp_File_Lifetime ); -$VERSION = '3.10'; +$VERSION = '3.11'; #.......................................................................... BEGIN { # Make a DEBUG constant very first thing... @@ -39,6 +39,8 @@ *IS_Dos = $^O eq 'dos' ? \&TRUE : \&FALSE unless defined &IS_Dos; *IS_OS2 = $^O eq 'os2' ? \&TRUE : \&FALSE unless defined &IS_OS2; *IS_Cygwin = $^O eq 'cygwin' ? \&TRUE : \&FALSE unless defined &IS_Cygwin; + *IS_Linux = $^O eq 'linux' ? \&TRUE : \&FALSE unless defined &IS_Linux; + *IS_HPUX = $^O =~ m/hpux/ ? \&TRUE : \&FALSE unless defined &IS_HPUX; } $Temp_File_Lifetime ||= 60 * 60 * 24 * 5; ==== lib/Pod/Perldoc/ToMan.pm#2 (text) ==== Index: lib/Pod/Perldoc/ToMan.pm --- lib/Pod/Perldoc/ToMan.pm.~1~ Wed Oct 22 20:08:57 2003 +++ lib/Pod/Perldoc/ToMan.pm Wed Oct 22 20:08:57 2003 @@ -55,12 +55,21 @@ . " $switches --lax $file | $render -man" ; # no temp file, just a pipe! + # Thanks to Brendan O'Dea for contributing the following block + if(Pod::Perldoc::IS_Linux and -t STDOUT + and my ($cols) = `stty -a` =~ m/\bcolumns\s+(\d+)/ + ) { + my $c = $cols * 39 / 40; + $cols = $c > $cols - 2 ? $c : $cols -2; + $command .= ' -rLL=' . (int $c) . 'n' if $cols > 80; + } + # I hear persistent reports that adding a -c switch to $render # solves many people's problems. But I also hear that some mans # don't have a -c switch, so that adding it here would presumably # be a Bad Thing -- sburke@cpan.org - $command .= " | col -x" if $^O =~ /hpux/; + $command .= " | col -x" if Pod::Perldoc::IS_HPUX; defined(&Pod::Perldoc::DEBUG) and Pod::Perldoc::DEBUG() ==== pod/perldoc.pod#2 (text) ==== Index: pod/perldoc.pod --- pod/perldoc.pod.~1~ Wed Oct 22 20:08:57 2003 +++ pod/perldoc.pod Wed Oct 22 20:08:57 2003 @@ -213,7 +213,7 @@ Past contributors are: Kenneth Albanowski <kjahds@kjahds.com>, -Andy Dougherty <doughera@lafayette.edu>, +Andy Dougherty <doughera@lafcol.lafayette.edu>, and many others. =cut ==== utils/perldoc.PL#17 (text) ==== Index: utils/perldoc.PL --- utils/perldoc.PL.~1~ Wed Oct 22 20:08:57 2003 +++ utils/perldoc.PL Wed Oct 22 20:08:57 2003 @@ -44,8 +44,8 @@ # This "$file" file was generated by "$0" require 5; +BEGIN { \$^W = 1 if \$ENV{'PERLDOCDEBUG'} } use Pod::Perldoc; -BEGIN { \$^W = 1 if \$ENV{'PERLDOCDEBUG'} } exit( Pod::Perldoc->run() ); !GROK!THIS! End of Patch.