r5612 - in /packages/libtk-pod-perl/branches/upstream/current: Changes META.yml Makefile.PL More.pm Pod.pm Pod/FindPods.pm Pod/Search.pm Pod/Search_db.pm Pod/SimpleBridge.pm Pod/Text.pm Pod/Tree.pm TODO tkmore

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Fri Jun 15 23:55:09 UTC 2007


Author: gwolf
Date: Fri Jun 15 23:55:09 2007
New Revision: 5612

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=5612
Log:
[svn-upgrade] Integrating new upstream version, libtk-pod-perl (0.9934)

Modified:
    packages/libtk-pod-perl/branches/upstream/current/Changes
    packages/libtk-pod-perl/branches/upstream/current/META.yml
    packages/libtk-pod-perl/branches/upstream/current/Makefile.PL
    packages/libtk-pod-perl/branches/upstream/current/More.pm
    packages/libtk-pod-perl/branches/upstream/current/Pod.pm
    packages/libtk-pod-perl/branches/upstream/current/Pod/FindPods.pm
    packages/libtk-pod-perl/branches/upstream/current/Pod/Search.pm
    packages/libtk-pod-perl/branches/upstream/current/Pod/Search_db.pm
    packages/libtk-pod-perl/branches/upstream/current/Pod/SimpleBridge.pm
    packages/libtk-pod-perl/branches/upstream/current/Pod/Text.pm
    packages/libtk-pod-perl/branches/upstream/current/Pod/Tree.pm
    packages/libtk-pod-perl/branches/upstream/current/TODO
    packages/libtk-pod-perl/branches/upstream/current/tkmore

Modified: packages/libtk-pod-perl/branches/upstream/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Changes?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Changes (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Changes Fri Jun 15 23:55:09 2007
@@ -1,4 +1,15 @@
 History for Tk::Pod
+
+version 0.9934
+	o Fixed fulltext search on Debian machines (different index
+	  location)
+	o minor Pod changes
+	o Tk::More and tkmore now support the -encoding option
+	o support coloring tree items for vendor directories
+	o new menu item: View Pod source (like Edit Pod, but using
+	  Tk::More)
+	o new method for Tk::More: AddQuitBindings
+	o documented public methods in Tk::More
 
 version 0.9933
 	o new menu items with search.cpan.org and annocpan.org links

Modified: packages/libtk-pod-perl/branches/upstream/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/META.yml?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/META.yml (original)
+++ packages/libtk-pod-perl/branches/upstream/current/META.yml Fri Jun 15 23:55:09 2007
@@ -1,6 +1,6 @@
 # http://module-build.sourceforge.net/META-spec.html
 name:         Tk-Pod
-version:      0.9933
+version:      0.9934
 version_from: 
 installdirs:  site
 requires:

Modified: packages/libtk-pod-perl/branches/upstream/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Makefile.PL?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Makefile.PL (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Makefile.PL Fri Jun 15 23:55:09 2007
@@ -2,7 +2,7 @@
 
 use ExtUtils::MakeMaker;
 
-$DIST_VERSION = "0.9933";
+$DIST_VERSION = "0.9934";
 $is_devel_host = defined $ENV{USER} && $ENV{USER} eq 'eserte' && $^O =~ /bsd/i && -f "../../perl.release.mk";
 if ($is_devel_host) {
     open(P, "Pod.pm") or die "Can't open Pod.pm: $!";
@@ -50,7 +50,8 @@
 	'DISTNAME'	=> 'Tk-Pod',
 	'NAME'		=> 'Tk::Pod',
 	'VERSION'	=> $DIST_VERSION,
-	'NO_META'	=> 1,
+	'NO_META'	=> 1, # manually generated
+	'LICENSE'	=> 'perl',
 
 	'DIR'		=> [],	# Tk-Pod dist build dir is ignored
 

Modified: packages/libtk-pod-perl/branches/upstream/current/More.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/More.pm?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/More.pm (original)
+++ packages/libtk-pod-perl/branches/upstream/current/More.pm Fri Jun 15 23:55:09 2007
@@ -3,7 +3,7 @@
 use strict;
 use vars qw($VERSION @ISA);
 
-$VERSION = sprintf("%d.%02d", q$Revision: 5.1 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 5.2 $ =~ /(\d+)\.(\d+)/);
 
 use Tk qw(Ev);
 use Tk::Derived;
@@ -96,6 +96,7 @@
 		   'Search'    => 'SELF',
 		   'ShowMatch' => 'SELF',
 		   'Load'      => 'SELF',
+		   'AddQuitBindings' => 'SELF',
 		  );
 
     $cw->{DIRECTION} = "Next";
@@ -190,9 +191,15 @@
 # Load copied from TextUndo (xxx yy marks changes)
 sub Load
 {
- my ($text,$file) = @_;
+ my ($text,$file,%args) = @_;
+ my $encoding = delete $args{-encoding};
+ die "Unhandled arguments: " . join(" ", %args) if %args;
  if (open(FILE,"<$file"))
   {
+   if ($encoding)
+    {
+     binmode FILE, ":encoding($encoding)";
+    }
    $text->MainWindow->Busy;
    $text->SUPER::delete('1.0','end');
    #yy delete $text->{UNDO};
@@ -289,6 +296,11 @@
     Tk->break;
 }
 
+sub AddQuitBindings {
+    my($more) = @_;
+    $more->bind("<q>" => sub { $more->toplevel->destroy });
+    $more->bind("<Control-q>" => sub { $more->toplevel->destroy });
+}
 
 #package Tk::More::Status;
 #
@@ -378,6 +390,30 @@
 
 =back
 
+=head1 METHODS
+
+=over
+
+=item Load($file, %args)
+
+Load I<$file> into the widget. I<%args> may be one of the following
+
+=over
+
+=item -encoding => I<$encoding>
+
+Assume the encoding of the file to be I<$encoding>. If none is given,
+then assume no encoding (which is equivalent to iso-8859-1).
+
+=back
+
+=item AddQuitBinding
+
+Convenience method to add the bindinds Key-q and Control-Key-q to
+close the Toplevel window containing this More widget.
+
+=back
+
 =head1 BUGS
 
 Besides that most of more bindings are not implemented. This bugs

Modified: packages/libtk-pod-perl/branches/upstream/current/Pod.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Pod.pm?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Pod.pm (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Pod.pm Fri Jun 15 23:55:09 2007
@@ -4,8 +4,8 @@
 use Tk::Toplevel;
 
 use vars qw($VERSION $DIST_VERSION @ISA);
-$VERSION = sprintf("%d.%02d", q$Revision: 5.15 $ =~ /(\d+)\.(\d+)/);
-$DIST_VERSION = "0.9933";
+$VERSION = sprintf("%d.%02d", q$Revision: 5.16 $ =~ /(\d+)\.(\d+)/);
+$DIST_VERSION = "0.9934";
 
 @ISA = qw(Tk::Toplevel);
 

Modified: packages/libtk-pod-perl/branches/upstream/current/Pod/FindPods.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Pod/FindPods.pm?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Pod/FindPods.pm (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Pod/FindPods.pm Fri Jun 15 23:55:09 2007
@@ -1,7 +1,7 @@
 # -*- perl -*-
 
 #
-# $Id: FindPods.pm,v 5.5 2007/02/27 21:46:30 eserte Exp $
+# $Id: FindPods.pm,v 5.6 2007/05/10 20:11:09 eserte Exp $
 # Author: Slaven Rezic
 #
 # Copyright (C) 2001,2003,2004,2005,2007 Slaven Rezic. All rights reserved.
@@ -14,6 +14,8 @@
 
 package Tk::Pod::FindPods;
 
+=encoding iso-8859-2
+
 =head1 NAME
 
 Tk::Pod::FindPods - find Pods installed on the current system
@@ -36,7 +38,7 @@
 
 @EXPORT_OK = qw/%pods $has_cache pod_find/;
 
-$VERSION = sprintf("%d.%02d", q$Revision: 5.5 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 5.6 $ =~ /(\d+)\.(\d+)/);
 
 BEGIN {  # Make a DEBUG constant very first thing...
   if(defined &DEBUG) {
@@ -325,6 +327,8 @@
 	'cpan';
     } elsif (is_site_module($path)) {
 	'site';
+    } elsif (is_vendor_module($path)) {
+	'vendor';
     } else {
 	'core';
     }
@@ -339,6 +343,15 @@
                 \Q$Config{'installsitelib'}\E
                |
 		\Q$Config{'installsitearch'}\E
+	       )/x;
+}
+
+sub is_vendor_module {
+    my $path = shift;
+    $path =~ /^(
+                \Q$Config{'installvendorlib'}\E
+               |
+		\Q$Config{'installvendorarch'}\E
 	       )/x;
 }
 
@@ -511,11 +524,11 @@
 
 =head1 SEE ALSO
 
-Tk::Tree(3).
+L<Tk::Tree>.
 
 =head1 AUTHOR
 
-Slaven Rezic <F<slaven at rezic.de>>
+Slaven Reziæ <F<slaven at rezic.de>>
 
 Copyright (c) 2001,2003,2004,2005 Slaven Rezic. All rights reserved.
 This program is free software; you can redistribute it and/or modify

Modified: packages/libtk-pod-perl/branches/upstream/current/Pod/Search.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Pod/Search.pm?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Pod/Search.pm (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Pod/Search.pm Fri Jun 15 23:55:09 2007
@@ -3,7 +3,7 @@
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = sprintf("%d.%02d", q$Revision: 5.3 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 5.4 $ =~ /(\d+)\.(\d+)/);
 
 use Carp;
 use Tk::Frame;
@@ -203,6 +203,8 @@
 1;
 __END__
 
+=encoding iso-8859-2
+
 =head1 NAME
 
 Tk::Pod::Search - Widget to access perlindex Pod full text index
@@ -258,7 +260,7 @@
 
 =head1 SEE ALSO
 
-Tk::Pod::Text, tkpod, perlindex, Tk::Pod, Tk::Pod::Search_db
+L<Tk::Pod::Text>, L<tkpod>, L<perlindex>, L<Tk::Pod>, L<Tk::Pod::Search_db>
 
 =head1 KEYWORDS
 
@@ -268,7 +270,7 @@
 
 Achim Bohnet <F<ach at mpe.mpg.de>>
 
-Current maintainer is Slaven Rezic <F<slaven at rezic.de>>.
+Current maintainer is Slaven Reziæ <F<slaven at rezic.de>>.
 
 Copyright (c) 1997-1998 Achim Bohnet. All rights reserved.  This program
 is free software; you can redistribute it and/or modify it under the same

Modified: packages/libtk-pod-perl/branches/upstream/current/Pod/Search_db.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Pod/Search_db.pm?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Pod/Search_db.pm (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Pod/Search_db.pm Fri Jun 15 23:55:09 2007
@@ -15,7 +15,7 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = sprintf("%d.%02d", q$Revision: 5.2 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 5.3 $ =~ /(\d+)\.(\d+)/);
 
 use Carp;
 use Fcntl;
@@ -25,6 +25,10 @@
 (my $PREFIX = $Config::Config{prefix}) =~ y|\\|/|d;
 (my $IDXDIR = $Config::Config{man1dir}) =~ s|/[^/]+$||;
 $IDXDIR ||= $PREFIX; # use perl directory if no manual directory exists
+# Debian uses a non-standard directory:
+if (-e "/etc/debian_version" && -d "/var/cache/perlindex") {
+    $IDXDIR = "/var/cache/perlindex";
+}
 
 sub new {
     my $class = shift;
@@ -133,6 +137,8 @@
 1;
 __END__
 
+=encoding iso-8859-2
+
 =head1 NAME
 
 Tk::Pod::Search_db - dirty OO wrapper for C<perlindex>'s search functionality
@@ -196,7 +202,7 @@
 
 =head1 SEE ALSO
 
-tkpod, perlindex perlpod, Tk::Pod::Search
+L<tkpod>, L<perlindex>, L<perlpod>, L<Tk::Pod::Search>
 
 =head1 AUTHORS
 
@@ -205,7 +211,7 @@
 Most of the code here is borrowed from L<perlindex> written by
 Ulrich Pfeifer <F<Ulrich.Pfeifer at de.uu.net>>.
 
-Current maintainer is Slaven Rezic <F<slaven at rezic.de>>.
+Current maintainer is Slaven Reziæ <F<slaven at rezic.de>>.
 
 Copyright (c) 1997-1998 Achim Bohnet. All rights reserved.  This program is
 free software; you can redistribute it and/or modify it under the same

Modified: packages/libtk-pod-perl/branches/upstream/current/Pod/SimpleBridge.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Pod/SimpleBridge.pm?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Pod/SimpleBridge.pm (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Pod/SimpleBridge.pm Fri Jun 15 23:55:09 2007
@@ -5,7 +5,7 @@
 # Interface between Tk::Pod and Pod::Simple
 
 use vars qw($VERSION);
-$VERSION = sprintf("%d.%02d", q$Revision: 5.2 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 5.3 $ =~ /(\d+)\.(\d+)/);
 
 BEGIN {  # Make a DEBUG constant very first thing...
   if(defined &DEBUG) {
@@ -387,6 +387,8 @@
 1;
 __END__
 
+=encoding iso-8859-2
+
 =head1 NAME
 
 Tk::Pod::SimpleBridge -- render Pod::Simple events to a Tk::Pod window
@@ -400,12 +402,12 @@
 
 =head1 DESCRIPTION
 
-This class contains methods that Tk::Pod (specifically Tk::Pod::Text)
+This class contains methods that L<Tk::Pod> (specifically L<Tk::Pod::Text>)
 uses to render a pod page's text into its window.  It uses L<Pod::Simple>
 (specifically L<Pod::Simple::PullParser>) to do the parsing.
 
-Tk::Pod used to use Tk::Parse (a snapshot of an old old Pod-parser)
-to do the Pod-parsing.  But it doesn't anymore -- it now uses Pod::Simple
+L<Tk::Pod> used to use Tk::Parse (a snapshot of an old old Pod-parser)
+to do the Pod-parsing.  But it doesn't anymore -- it now uses L<Pod::Simple>
 via this module.
 
 =head1 COPYRIGHT AND DISCLAIMERS
@@ -425,6 +427,6 @@
 the old Tk::Pod::Text code that Nick Ing-Simmons
 <F<nick at ni-s.u-net.com>> originally wrote.
 
-Current maintainer is Slaven Rezic <F<slaven at rezic.de>>.
+Current maintainer is Slaven Reziæ <F<slaven at rezic.de>>.
 
 =cut

Modified: packages/libtk-pod-perl/branches/upstream/current/Pod/Text.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Pod/Text.pm?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Pod/Text.pm (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Pod/Text.pm Fri Jun 15 23:55:09 2007
@@ -26,7 +26,7 @@
 use vars qw($VERSION @ISA @POD $IDX
 	    @tempfiles @gv_pids $terminal_fallback_warn_shown);
 
-$VERSION = sprintf("%d.%02d", q$Revision: 5.9 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 5.11 $ =~ /(\d+)\.(\d+)/);
 
 @ISA = qw(Tk::Frame Tk::Pod::SimpleBridge Tk::Pod::Cache);
 
@@ -250,14 +250,14 @@
  $w->markSet(insert => '@0,0');
 }
 
-sub edit
+# Works also for viewing source code
+sub _get_editable_path
 {
- my ($w,$edit,$linenumber) = @_;
- my($text, $path);
- $path = $w->cget('-path');
+ my ($w) = @_;
+ my $path = $w->cget('-path');
  if (!defined $path)
   {
-   $text = $w->cget("-text");
+   my $text = $w->cget("-text");
    $w->_need_File_Temp;
    my($fh,$fname) = File::Temp::tempfile(UNLINK => 1,
 					 SUFFIX => ".pod");
@@ -265,6 +265,13 @@
    close $fh;
    $path = $fname;
   }
+ $path;
+}
+
+sub edit
+{
+ my ($w,$edit,$linenumber) = @_;
+ my $path = $w->_get_editable_path;
  if (!defined $edit)
   {
    $edit = $ENV{TKPODEDITOR};
@@ -358,6 +365,22 @@
  $w->edit(undef, $linenumber);
 }
 
+sub view_source
+{
+ my($w) = @_;
+ # XXX why is -title empty here?
+ my $title = $w->cget(-title) || $w->cget('-file');
+ my $t = $w->Toplevel(-title => "Source of $title - Tkpod");
+ my $font_size = $w->base_font_size;
+ my $more = $t->Scrolled('More',
+			 -font => "Courier $font_size",
+			 -scrollbars => $Tk::platform eq 'MSWin32' ? 'e' : 'w',
+			)->pack(-fill => "both", -expand => 1);
+ $more->Load($w->_get_editable_path);
+ $more->AddQuitBindings;
+ $more->focus;
+}
+
 sub _sgn { $_[0] cmp 0 }
 
 sub zoom_normal {
@@ -443,6 +466,7 @@
 	  [Button => 'Forward',  -command => [$w, 'history_move', +1]],
 	  [Button => 'Reload',   -command => sub{$w->reload} ],
 	  [Button => 'Edit Pod',       -command => sub{ $w->edit_get_linenumber } ],
+	  [Button => 'View source',    -command => sub{ $w->view_source } ],
 	  [Button => 'Search fulltext',-command => ['SearchFullText', $w]],
 	  [Separator => ""],
 	  [Cascade => 'Edit',
@@ -1406,7 +1430,7 @@
 
 Nick Ing-Simmons <F<nick at ni-s.u-net.com>>
 
-Current maintainer is Slaven Rezic <F<slaven at rezic.de>>.
+Current maintainer is Slaven ReziE<0x107> <F<slaven at rezic.de>>.
 
 Copyright (c) 1998 Nick Ing-Simmons.  All rights reserved.  This program
 is free software; you can redistribute it and/or modify it under the same

Modified: packages/libtk-pod-perl/branches/upstream/current/Pod/Tree.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/Pod/Tree.pm?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Pod/Tree.pm (original)
+++ packages/libtk-pod-perl/branches/upstream/current/Pod/Tree.pm Fri Jun 15 23:55:09 2007
@@ -1,7 +1,7 @@
 # -*- perl -*-
 
 #
-# $Id: Tree.pm,v 5.2 2007/02/27 21:46:43 eserte Exp $
+# $Id: Tree.pm,v 5.4 2007/05/10 20:11:09 eserte Exp $
 # Author: Slaven Rezic
 #
 # Copyright (C) 2001,2004,2007 Slaven Rezic. All rights reserved.
@@ -54,7 +54,7 @@
 
 use strict;
 use vars qw($VERSION @ISA @POD %EXTRAPODDIR $FindPods $ExtraFindPods);
-$VERSION = sprintf("%d.%02d", q$Revision: 5.2 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 5.4 $ =~ /(\d+)\.(\d+)/);
 
 use base 'Tk::Tree';
 
@@ -234,6 +234,10 @@
 					-foreground => '#702000',
 					-selectforeground => '#702000',
 				       );
+    $w->{Style}{'vendor'} = $w->ItemStyle('imagetext',
+					  -foreground => '#856b48',
+					  -selectforeground => '#856b48',
+					 );
     $w->{Style}{'cpan'} = $w->ItemStyle('imagetext',
 					-foreground => '#000080',
 					-selectforeground => '#000080',
@@ -610,13 +614,13 @@
 
 =head1 SEE ALSO
 
-Tk::Tree(3), Tk::Pod(3), tkpod(1), Tk::Pod::FindPods(3).
+L<Tk::Tree>, L<Tk::Pod>, L<tkpod>, L<Tk::Pod::FindPods>.
 
 =head1 AUTHOR
 
-Slaven Rezic <F<slaven at rezic.de>>
-
-Copyright (c) 2001,2004 Slaven Rezic.  All rights reserved.  This program
+Slaven ReziE<0x107> <F<slaven at rezic.de>>
+
+Copyright (c) 2001,2004 Slaven ReziE<0x107>.  All rights reserved.  This program
 is free software; you can redistribute it and/or modify it under the same
 terms as Perl itself.
 

Modified: packages/libtk-pod-perl/branches/upstream/current/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/TODO?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/TODO (original)
+++ packages/libtk-pod-perl/branches/upstream/current/TODO Fri Jun 15 23:55:09 2007
@@ -8,22 +8,6 @@
 =head3 Tk::Pod
 
 =over
-
-=item *
-
-Ctrl-O Exporter does not work?!
-
-=item *
-
-What about the reported error on Suse Linux (see Tk-Pod entry on
-rt.cpan.org)? I can't reproduce this bug...
-
-=item *
-
-Dump does not always work on a RedHat 8.0 system, so I had to use a
-workaround. Also, Tk::Pod very often dumps core on this system in
-conjuction with perl5.8.0 and Tk800.025, but this might be a
-RedHat-related issue.
 
 =item *
 
@@ -35,11 +19,6 @@
 For Windows: check whether Tk::More/Tk::Tree match the system
 background colors. Also check if the "Help" menu item is on the
 correct place.
-
-=item *
-
-maybe special handling for Tk::Pod::FindPods under Mac OS X is
-necessary (pod directory is /System/Library/Perl/pods)
 
 =item *
 
@@ -75,6 +54,16 @@
 
 =back
 
+=head3 Tk::Pod::FindPods
+
+=over
+
+=item *
+
+The location of the cache file is predictable and on /tmp which is
+bad. Either choose a unpredictable but unique filename, or use
+techniques like O_EXCL (is this supported everywhere?).
+
 =head3 Tk::Pod::Tree
 
 =over
@@ -148,10 +137,6 @@
 =item *
 
 Optionally save settings on exit, e.g. current base font size.
-
-=item *
-
-New menu item: View Pod source (like Edit Pod, but using tkmore or Tk::More)
 
 =item *
 
@@ -341,3 +326,28 @@
 
 =back
 
+=head2 Expired
+
+These bugs are probably fixed or not reproducable or apparent on old
+systems only:
+
+=over
+
+=item *
+
+Ctrl-O Exporter does not work?!
+
+=item *
+
+What about the reported error on Suse Linux (see Tk-Pod entry on
+rt.cpan.org)? I can't reproduce this bug...
+
+=item *
+
+Dump does not always work on a RedHat 8.0 system, so I had to use a
+workaround. Also, Tk::Pod very often dumps core on this system in
+conjuction with perl5.8.0 and Tk800.025, but this might be a
+RedHat-related issue.
+
+=back
+

Modified: packages/libtk-pod-perl/branches/upstream/current/tkmore
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtk-pod-perl/branches/upstream/current/tkmore?rev=5612&op=diff
==============================================================================
--- packages/libtk-pod-perl/branches/upstream/current/tkmore (original)
+++ packages/libtk-pod-perl/branches/upstream/current/tkmore Fri Jun 15 23:55:09 2007
@@ -3,7 +3,7 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = sprintf("%d.%02d", q$Revision: 5.3 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 5.4 $ =~ /(\d+)\.(\d+)/);
 
 use Tk;
 use Tk::More;
@@ -12,7 +12,7 @@
 my %opt = (font => "Courier 10"); # XXX do not hardcode, get size from default font
 
 Getopt::Long::config('pass_through');
-if (!GetOptions(\%opt, "font=s", "i|ignore-case!")) {
+if (!GetOptions(\%opt, "font=s", "i|ignore-case!", "encoding=s")) {
     require Pod::Usage;
     Pod::Usage::pod2usage(2);
 }
@@ -62,13 +62,12 @@
 
 $more->focus;
 load_file($file);
-$more->bind("<q>" => sub { $mw->destroy });
-$more->bind("<Control-q>" => sub { $mw->destroy });
+$more->AddQuitBindings;
 MainLoop;
 
 sub load_file {
     my $file = shift;
-    $more->Load($file);
+    $more->Load($file, -encoding => $opt{encoding});
     $mw->title("tkmore - $file");
 }
 
@@ -80,7 +79,7 @@
 
 =head1 SYNOPSIS
 
-    tkmore [X11 options] [-i] filename
+    tkmore [X11 options] [-i] [-encoding encoding] filename
 
 =head1 DESCRIPTION
 
@@ -88,11 +87,18 @@
 
 =head2 OPTIONS
 
+Besides standard X11 options like C<-font>, B<tkmore> supports:
+
 =over
 
 =item -i
 
-Turn on case-insensitive search.
+Turn on case-insensitive search. Alias: C<-ignore-case>.
+
+=item -encoding encoding
+
+Specify the encoding for the specified file and all subsequently
+loaded files. By default no encoding is assumed.
 
 =back
 




More information about the Pkg-perl-cvs-commits mailing list