[Templates-cvs] cvs commit: Template2/lib/Template/Plugin Autoformat.pm CGI.pm Datafile.pm Date.pm Directory.pm Dumper.pm File.pm Filter.pm Format.pm HTML.pm Image.pm Iterator.pm List.pm Math.pm Pod.pm Procedural.pm String.pm Table.pm URL.pm View.pm Wrap.pm

cvs@template-toolkit.org cvs@template-toolkit.org


cvs         06/05/30 17:01:37

  Modified:    lib/Template/Plugin Autoformat.pm CGI.pm Datafile.pm Date.pm
                        Directory.pm Dumper.pm File.pm Filter.pm Format.pm
                        HTML.pm Image.pm Iterator.pm List.pm Math.pm Pod.pm
                        Procedural.pm String.pm Table.pm URL.pm View.pm
                        Wrap.pm
  Log:
  * Fixed all the version numbers
  * General code cleanup
  * Changed copyright messages, email addresses, etc.
  * Released version 2.15b
  
  Revision  Changes    Path
  2.70      +8 -11     Template2/lib/Template/Plugin/Autoformat.pm
  
  Index: Autoformat.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Autoformat.pm,v
  retrieving revision 2.69
  retrieving revision 2.70
  diff -u -r2.69 -r2.70
  --- Autoformat.pm	2006/05/30 15:53:36	2.69
  +++ Autoformat.pm	2006/05/30 17:01:34	2.70
  @@ -9,33 +9,30 @@
   #   Robert McArthur <mcarthur@dstc.edu.au>
   #     - original plugin code
   #
  -#   Andy Wardley    <abw@kfs.org>
  +#   Andy Wardley    <abw@wardley.org>
   #     - added FILTER registration, support for forms and some additional
   #       documentation
   #
   # COPYRIGHT
  -#   Copyright (C) 2000 Robert McArthur & Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 2000-2006 Robert McArthur, Andy Wardley.  
  +#   All Rights Reserved.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
  -#----------------------------------------------------------------------------
  +# REVISION
  +#   $Id: Autoformat.pm,v 2.70 2006/05/30 17:01:34 abw Exp $
   #
  -# $Id: Autoformat.pm,v 2.69 2006/05/30 15:53:36 abw Exp $
  -#
   #============================================================================
   
   package Template::Plugin::Autoformat;
   
  -require 5.004;
  -
   use strict;
  -use vars qw( $VERSION );
  -use base qw( Template::Plugin );
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   use Text::Autoformat;
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.69 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.70;
   
   sub new {
       my ($class, $context, $options) = @_;
  
  
  
  2.70      +8 -12     Template2/lib/Template/Plugin/CGI.pm
  
  Index: CGI.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/CGI.pm,v
  retrieving revision 2.69
  retrieving revision 2.70
  diff -u -r2.69 -r2.70
  --- CGI.pm	2006/05/30 15:53:37	2.69
  +++ CGI.pm	2006/05/30 17:01:34	2.70
  @@ -7,32 +7,28 @@
   #   Simple Template Toolkit plugin interfacing to the CGI.pm module.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 1996-2000 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 1996-2006 Andy Wardley.  All Rights Reserved.
   #   Copyright (C) 1998-2000 Canon Research Centre Europe Ltd.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
  -#----------------------------------------------------------------------------
  +# REVISION
  +#   $Id: CGI.pm,v 2.70 2006/05/30 17:01:34 abw Exp $
   #
  -# $Id: CGI.pm,v 2.69 2006/05/30 15:53:37 abw Exp $
  -#
   #============================================================================
   
   package Template::Plugin::CGI;
   
  -require 5.004;
  -
   use strict;
  -use vars qw( $VERSION );
  -use base qw( Template::Plugin );
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   use CGI;
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.69 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.70;
   
   sub new {
       my $class   = shift;
  @@ -142,7 +138,7 @@
   
   =head1 VERSION
   
  -2.68, distributed as part of the
  +2.7, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.72      +8 -12     Template2/lib/Template/Plugin/Datafile.pm
  
  Index: Datafile.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Datafile.pm,v
  retrieving revision 2.71
  retrieving revision 2.72
  diff -u -r2.71 -r2.72
  --- Datafile.pm	2006/05/30 15:53:37	2.71
  +++ Datafile.pm	2006/05/30 17:01:34	2.72
  @@ -8,31 +8,27 @@
   #   list object containing hashes representing records in the file.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 1996-2000 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 1996-2006 Andy Wardley.  All Rights Reserved.
   #   Copyright (C) 1998-2000 Canon Research Centre Europe Ltd.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
  -#----------------------------------------------------------------------------
  +# REVISION
  +#   $Id: Datafile.pm,v 2.72 2006/05/30 17:01:34 abw Exp $
   #
  -# $Id: Datafile.pm,v 2.71 2006/05/30 15:53:37 abw Exp $
  -#
   #============================================================================
   
   package Template::Plugin::Datafile;
   
  -require 5.004;
  -
   use strict;
  -use vars qw( @ISA $VERSION );
  -use base qw( Template::Plugin );
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.71 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.72;
   
   sub new {
       my ($class, $context, $filename, $params) = @_;
  @@ -172,7 +168,7 @@
   
   =head1 VERSION
   
  -2.70, distributed as part of the
  +2.72, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.77      +11 -12    Template2/lib/Template/Plugin/Date.pm
  
  Index: Date.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Date.pm,v
  retrieving revision 2.76
  retrieving revision 2.77
  diff -u -r2.76 -r2.77
  --- Date.pm	2006/05/30 15:53:37	2.76
  +++ Date.pm	2006/05/30 17:01:34	2.77
  @@ -8,32 +8,31 @@
   #
   # AUTHORS
   #   Thierry-Michel Barral  <kktos@electron-libre.com>
  -#   Andy Wardley           <abw@cre.canon.co.uk>
  +#   Andy Wardley           <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 2000 Thierry-Michel Barral, Andy Wardley.
  +#   Copyright (C) 2000-2006 Thierry-Michel Barral, Andy Wardley.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
  -#----------------------------------------------------------------------------
  +# REVISION
  +#   $Id: Date.pm,v 2.77 2006/05/30 17:01:34 abw Exp $
   #
  -# $Id: Date.pm,v 2.76 2006/05/30 15:53:37 abw Exp $
  -#
   #============================================================================
   
   package Template::Plugin::Date;
   
   use strict;
  -use vars qw( $VERSION $FORMAT @LOCALE_SUFFIX );
  -use base qw( Template::Plugin );
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   
   use POSIX ();
  +
  +our $VERSION = 2.77;
  +our $FORMAT  = '%H:%M:%S %d-%b-%Y';    # default strftime() format
  +our @LOCALE_SUFFIX = qw( .ISO8859-1 .ISO_8859-15 .US-ASCII .UTF-8 );
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.76 $ =~ /(\d+)\.(\d+)/);
  -$FORMAT  = '%H:%M:%S %d-%b-%Y';    # default strftime() format
  -@LOCALE_SUFFIX = qw( .ISO8859-1 .ISO_8859-15 .US-ASCII .UTF-8 );
   
   #------------------------------------------------------------------------
   # new(\%options)
  @@ -343,7 +342,7 @@
   
   =head1 VERSION
   
  -2.75, distributed as part of the
  +2.77, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   
  
  
  
  2.70      +6 -8      Template2/lib/Template/Plugin/Directory.pm
  
  Index: Directory.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Directory.pm,v
  retrieving revision 2.69
  retrieving revision 2.70
  diff -u -r2.69 -r2.70
  --- Directory.pm	2006/05/30 15:53:37	2.69
  +++ Directory.pm	2006/05/30 17:01:34	2.70
  @@ -7,29 +7,27 @@
   #
   # AUTHORS
   #   Michael Stevens <michael@etla.org>, with some mutilations from 
  -#   Andy Wardley <abw@kfs.org>.
  +#   Andy Wardley <abw@wardley.org>.
   #
   # COPYRIGHT
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Directory.pm,v 2.69 2006/05/30 15:53:37 abw Exp $
  +#   $Id: Directory.pm,v 2.70 2006/05/30 17:01:34 abw Exp $
   #
   #============================================================================
   
   package Template::Plugin::Directory;
   
  -require 5.004;
  -
   use strict;
  +use warnings;
   use Cwd;
   use File::Spec;
   use Template::Plugin::File;
  -use vars qw( $VERSION );
  -use base qw( Template::Plugin::File );
  +use base 'Template::Plugin::File';
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.69 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.70;
   
   
   #------------------------------------------------------------------------
  @@ -394,7 +392,7 @@
   
   =head1 VERSION
   
  -2.68, distributed as part of the
  +2.7, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   
  
  
  
  2.70      +10 -15    Template2/lib/Template/Plugin/Dumper.pm
  
  Index: Dumper.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Dumper.pm,v
  retrieving revision 2.69
  retrieving revision 2.70
  diff -u -r2.69 -r2.70
  --- Dumper.pm	2006/05/30 15:53:37	2.69
  +++ Dumper.pm	2006/05/30 17:01:34	2.70
  @@ -10,33 +10,28 @@
   #   Simon Matthews <sam@knowledgepool.com>
   #
   # COPYRIGHT
  -#
   #   Copyright (C) 2000 Simon Matthews.  All Rights Reserved
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
  -#
  -#------------------------------------------------------------------------------
   #
  -# $Id: Dumper.pm,v 2.69 2006/05/30 15:53:37 abw Exp $
  +# REVISION
  +#   $Id: Dumper.pm,v 2.70 2006/05/30 17:01:34 abw Exp $
   # 
   #==============================================================================
   
   package Template::Plugin::Dumper;
   
  -require 5.004;
  -
   use strict;
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   use Data::Dumper;
  -
  -use vars qw( $VERSION $DEBUG @DUMPER_ARGS $AUTOLOAD );
  -use base qw( Template::Plugin );
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.69 $ =~ /(\d+)\.(\d+)/);
  -$DEBUG   = 0 unless defined $DEBUG;
  -@DUMPER_ARGS = qw( Indent Pad Varname Purity Useqq Terse Freezer
  -                   Toaster Deepcopy Quotekeys Bless Maxdepth );
  +our $VERSION = 2.70;
  +our $DEBUG   = 0 unless defined $DEBUG;
  +our @DUMPER_ARGS = qw( Indent Pad Varname Purity Useqq Terse Freezer
  +                       Toaster Deepcopy Quotekeys Bless Maxdepth );
  +our $AUTOLOAD;
   
   #==============================================================================
   #                      -----  CLASS METHODS -----
  @@ -161,7 +156,7 @@
   
   =head1 VERSION
   
  -2.68, distributed as part of the
  +2.7, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   
  
  
  
  2.71      +3 -3      Template2/lib/Template/Plugin/File.pm
  
  Index: File.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/File.pm,v
  retrieving revision 2.70
  retrieving revision 2.71
  diff -u -r2.70 -r2.71
  --- File.pm	2006/05/30 15:53:37	2.70
  +++ File.pm	2006/05/30 17:01:34	2.71
  @@ -16,7 +16,7 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: File.pm,v 2.70 2006/05/30 15:53:37 abw Exp $
  +#   $Id: File.pm,v 2.71 2006/05/30 17:01:34 abw Exp $
   #
   #============================================================================
   
  @@ -29,7 +29,7 @@
   use File::Basename;
   use base 'Template::Plugin';
   
  -our $VERSION = sprintf("%d.%02d", q$Revision: 2.70 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.71;
   
   our @STAT_KEYS = qw( dev ino mode nlink uid gid rdev size 
                        atime mtime ctime blksize blocks );
  @@ -400,7 +400,7 @@
   
   =head1 VERSION
   
  -2.69, distributed as part of the
  +2.71, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   
  
  
  
  1.36      +8 -12     Template2/lib/Template/Plugin/Filter.pm
  
  Index: Filter.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Filter.pm,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Filter.pm	2006/05/30 15:53:37	1.35
  +++ Filter.pm	2006/05/30 17:01:34	1.36
  @@ -8,31 +8,27 @@
   #   FILTER directive.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 2001 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 2001,2006 Andy Wardley.  All Rights Reserved.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Filter.pm,v 1.35 2006/05/30 15:53:37 abw Exp $
  +#   $Id: Filter.pm,v 1.36 2006/05/30 17:01:34 abw Exp $
   #
   #============================================================================
   
   package Template::Plugin::Filter;
   
  -require 5.004;
  -
   use strict;
  -use Template::Plugin;
  -
  -use base qw( Template::Plugin );
  -use vars qw( $VERSION $DYNAMIC );
  +use warnings;
  +use base 'Template::Plugin';
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 1.35 $ =~ /(\d+)\.(\d+)/);
  -$DYNAMIC = 0 unless defined $DYNAMIC;
  +our $VERSION = 1.36;
  +our $DYNAMIC = 0 unless defined $DYNAMIC;
   
   
   sub new {
  @@ -410,7 +406,7 @@
   
   =head1 VERSION
   
  -1.34, distributed as part of the
  +1.36, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.70      +8 -12     Template2/lib/Template/Plugin/Format.pm
  
  Index: Format.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Format.pm,v
  retrieving revision 2.69
  retrieving revision 2.70
  diff -u -r2.69 -r2.70
  --- Format.pm	2006/05/30 15:53:37	2.69
  +++ Format.pm	2006/05/30 17:01:34	2.70
  @@ -7,31 +7,27 @@
   #   Simple Template Toolkit Plugin which creates formatting functions.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 1996-2000 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 1996-2006 Andy Wardley.  All Rights Reserved.
   #   Copyright (C) 1998-2000 Canon Research Centre Europe Ltd.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
  -#----------------------------------------------------------------------------
  +# REVISION
  +#   $Id: Format.pm,v 2.70 2006/05/30 17:01:34 abw Exp $
   #
  -# $Id: Format.pm,v 2.69 2006/05/30 15:53:37 abw Exp $
  -#
   #============================================================================
   
   package Template::Plugin::Format;
   
  -require 5.004;
  -
   use strict;
  -use vars qw( @ISA $VERSION );
  -use base qw( Template::Plugin );
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.69 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.70;
   
   
   sub new {
  @@ -98,7 +94,7 @@
   
   =head1 VERSION
   
  -2.68, distributed as part of the
  +2.7, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.62      +8 -12     Template2/lib/Template/Plugin/HTML.pm
  
  Index: HTML.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/HTML.pm,v
  retrieving revision 2.61
  retrieving revision 2.62
  diff -u -r2.61 -r2.62
  --- HTML.pm	2006/05/30 15:53:37	2.61
  +++ HTML.pm	2006/05/30 17:01:35	2.62
  @@ -8,31 +8,27 @@
   #   HTML.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 1996-2001 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 1996-2006 Andy Wardley.  All Rights Reserved.
   #   Copyright (C) 1998-2001 Canon Research Centre Europe Ltd.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
  -#----------------------------------------------------------------------------
  +# REVISION
  +#   $Id: HTML.pm,v 2.62 2006/05/30 17:01:35 abw Exp $
   #
  -# $Id: HTML.pm,v 2.61 2006/05/30 15:53:37 abw Exp $
  -#
   #============================================================================
   
   package Template::Plugin::HTML;
   
  -require 5.004;
  -
   use strict;
  -use vars qw( $VERSION );
  -use base qw( Template::Plugin );
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.61 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.62;
   
   sub new {
       my ($class, $context, @args) = @_;
  @@ -171,7 +167,7 @@
   
   =head1 VERSION
   
  -2.60, distributed as part of the
  +2.62, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  1.21      +6 -11     Template2/lib/Template/Plugin/Image.pm
  
  Index: Image.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Image.pm,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Image.pm	2006/05/30 15:53:37	1.20
  +++ Image.pm	2006/05/30 17:01:35	1.21
  @@ -13,25 +13,20 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Image.pm,v 1.20 2006/05/30 15:53:37 abw Exp $
  +#   $Id: Image.pm,v 1.21 2006/05/30 17:01:35 abw Exp $
   #
   #============================================================================
   
   package Template::Plugin::Image;
   
  -require 5.004;
  -
   use strict;
  +use warnings;
  +use base 'Template::Plugin';
   use Template::Exception;
  -use Template::Plugin;
   use File::Spec;
  -#use Image::Info;
  -#use Image::Size;
  -
  -use base qw( Template::Plugin );
  -use vars qw( $VERSION $AUTOLOAD );
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 1.20 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 1.21;
  +our $AUTOLOAD;
   
   BEGIN {
       if (eval { require Image::Info; }) {
  @@ -448,7 +443,7 @@
   
   =head1 VERSION
   
  -1.19, distributed as part of the
  +1.21, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.68      +8 -12     Template2/lib/Template/Plugin/Iterator.pm
  
  Index: Iterator.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Iterator.pm,v
  retrieving revision 2.67
  retrieving revision 2.68
  diff -u -r2.67 -r2.68
  --- Iterator.pm	2006/05/30 15:53:37	2.67
  +++ Iterator.pm	2006/05/30 17:01:35	2.68
  @@ -8,31 +8,27 @@
   #   configuration parameters.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 2000 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 2000-2006 Andy Wardley.  All Rights Reserved.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
  -#----------------------------------------------------------------------------
  +# REVISION
  +#   $Id: Iterator.pm,v 2.68 2006/05/30 17:01:35 abw Exp $
   #
  -# $Id: Iterator.pm,v 2.67 2006/05/30 15:53:37 abw Exp $
  -#
   #============================================================================
   
   package Template::Plugin::Iterator;
   
  -require 5.004;
  -
   use strict;
  -use vars qw( $VERSION );
  -use base qw( Template::Plugin );
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   use Template::Iterator;
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.67 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.68;
   
   #------------------------------------------------------------------------
   # new($context, \@data, \%args)
  @@ -92,7 +88,7 @@
   
   =head1 VERSION
   
  -2.66, distributed as part of the
  +2.68, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  1.3       +9 -16     Template2/lib/Template/Plugin/List.pm
  
  Index: List.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/List.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- List.pm	2002/11/01 18:57:19	1.2
  +++ List.pm	2006/05/30 17:01:35	1.3
  @@ -6,34 +6,30 @@
   #   Template Toolkit plugin to implement an OO List object.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 2001 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 2001-2006 Andy Wardley.  All Rights Reserved.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: List.pm,v 1.2 2002/11/01 18:57:19 abw Exp $
  +#   $Id: List.pm,v 1.3 2006/05/30 17:01:35 abw Exp $
   #
   #============================================================================
   
   package Template::Plugin::List;
   
  -require 5.004;
  -
   use strict;
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   use Template::Exception;
  -
  -use base qw( Template::Plugin );
  -use vars qw( $VERSION $ERROR);
   use overload q|""| => "text",
                fallback => 1;
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 1.2 $ =~ /(\d+)\.(\d+)/);
  -$ERROR   = '';
  +our $VERSION = 1.21;
  +our $ERROR   = '';
   
   
   local $" = ', ';
  @@ -644,13 +640,10 @@
   =back
   
   =head1 AUTHOR
  -
  -Andy Wardley E<lt>abw@kfs.orgE<gt>
  -
  -L<http://www.andywardley.com/|http://www.andywardley.com/>
  -
   
  +Andy Wardley E<lt>abw@wardley.orgE<gt>
   
  +L<http://wardley.org/>
   
   =head1 VERSION
   
  
  
  
  1.16      +7 -7      Template2/lib/Template/Plugin/Math.pm
  
  Index: Math.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Math.pm,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Math.pm	2006/05/30 15:53:37	1.15
  +++ Math.pm	2006/05/30 17:01:35	1.16
  @@ -16,19 +16,19 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Math.pm,v 1.15 2006/05/30 15:53:37 abw Exp $
  +#   $Id: Math.pm,v 1.16 2006/05/30 17:01:35 abw Exp $
   #
   #============================================================================
   
   package Template::Plugin::Math;
   
  -require 5.004;
  -
   use strict;
  -use vars qw( $VERSION $AUTOLOAD );
  -use base qw( Template::Plugin );
  +use warnings;
  +use base 'Template::Plugin';
  +
  +our $VERSION = 1.16;
  +our $AUTOLOAD;
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 1.15 $ =~ /(\d+)\.(\d+)/);
   
   
   #------------------------------------------------------------------------
  @@ -248,7 +248,7 @@
   
   =head1 VERSION
   
  -1.14, distributed as part of the
  +1.16, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.69      +7 -10     Template2/lib/Template/Plugin/Pod.pm
  
  Index: Pod.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Pod.pm,v
  retrieving revision 2.68
  retrieving revision 2.69
  diff -u -r2.68 -r2.69
  --- Pod.pm	2006/05/30 15:53:37	2.68
  +++ Pod.pm	2006/05/30 17:01:35	2.69
  @@ -6,29 +6,26 @@
   #  Pod parser and object model.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 2000 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 2000-2006 Andy Wardley.  All Rights Reserved.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Pod.pm,v 2.68 2006/05/30 15:53:37 abw Exp $
  +#   $Id: Pod.pm,v 2.69 2006/05/30 17:01:35 abw Exp $
   #
   #============================================================================
   
   package Template::Plugin::Pod;
   
  -require 5.004;
  -
   use strict;
  -use Template::Plugin;
  -use vars qw( $VERSION );
  -use base qw( Template::Plugin );
  +use warnings;
  +use base 'Template::Plugin';
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.68 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.69;
   
   use Pod::POM;
   
  @@ -90,7 +87,7 @@
   
   =head1 VERSION
   
  -2.67, distributed as part of the
  +2.69, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  1.17      +9 -14     Template2/lib/Template/Plugin/Procedural.pm
  
  Index: Procedural.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Procedural.pm,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Procedural.pm	2006/05/30 15:53:37	1.16
  +++ Procedural.pm	2006/05/30 17:01:36	1.17
  @@ -3,36 +3,31 @@
   # Template::Plugin::Procedural
   #
   # DESCRIPTION
  +#   A Template Plugin to provide a Template Interface to Data::Dumper
   #
  -# A Template Plugin to provide a Template Interface to Data::Dumper
  -#
   # AUTHOR
   #   Mark Fowler <mark@twoshortplanks.com>
   #
   # COPYRIGHT
  -#
   #   Copyright (C) 2002 Mark Fowler.  All Rights Reserved
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
  -#
  -#------------------------------------------------------------------------------
   #
  -# $Id: Procedural.pm,v 1.16 2006/05/30 15:53:37 abw Exp $
  +# REVISION
  +#   $Id: Procedural.pm,v 1.17 2006/05/30 17:01:36 abw Exp $
   # 
   #==============================================================================
   
   package Template::Plugin::Procedural;
   
  -require 5.004;
  -
   use strict;
  -
  -use vars qw( $VERSION $DEBUG $AUTOLOAD );
  -use base qw( Template::Plugin );
  +use warnings;
  +use base 'Template::Plugin';
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 1.16 $ =~ /(\d+)\.(\d+)/);
  -$DEBUG   = 0 unless defined $DEBUG;
  +our $VERSION = 1.17;
  +our $DEBUG   = 0 unless defined $DEBUG;
  +our $AUTOLOAD;
   
   #------------------------------------------------------------------------
   # load
  @@ -144,7 +139,7 @@
   
   =head1 VERSION
   
  -1.15, distributed as part of the
  +1.17, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.40      +8 -11     Template2/lib/Template/Plugin/String.pm
  
  Index: String.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/String.pm,v
  retrieving revision 2.39
  retrieving revision 2.40
  diff -u -r2.39 -r2.40
  --- String.pm	2006/05/30 15:53:37	2.39
  +++ String.pm	2006/05/30 17:01:36	2.40
  @@ -6,34 +6,31 @@
   #   Template Toolkit plugin to implement a basic String object.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 2001 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 2001-2006 Andy Wardley.  All Rights Reserved.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: String.pm,v 2.39 2006/05/30 15:53:37 abw Exp $
  +#   $Id: String.pm,v 2.40 2006/05/30 17:01:36 abw Exp $
   #
   #============================================================================
   
   package Template::Plugin::String;
   
  -require 5.004;
  -
   use strict;
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   use Template::Exception;
   
  -use base qw( Template::Plugin );
  -use vars qw( $VERSION $ERROR);
   use overload q|""| => "text",
                fallback => 1;
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.39 $ =~ /(\d+)\.(\d+)/);
  -$ERROR   = '';
  +our $VERSION = 2.40;
  +our $ERROR   = '';
   
   *centre  = \*center;
   *append  = \*push;
  @@ -810,7 +807,7 @@
   
   =head1 VERSION
   
  -2.38, distributed as part of the
  +2.4, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.71      +4 -4      Template2/lib/Template/Plugin/Table.pm
  
  Index: Table.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Table.pm,v
  retrieving revision 2.70
  retrieving revision 2.71
  diff -u -r2.70 -r2.71
  --- Table.pm	2006/05/30 15:53:37	2.70
  +++ Table.pm	2006/05/30 17:01:36	2.71
  @@ -8,7 +8,7 @@
   #   from which row and column permutations can be fetched.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@cpan.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
   #   Copyright (C) 2000-2006 Andy Wardley.  All Rights Reserved.
  @@ -17,7 +17,7 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Table.pm,v 2.70 2006/05/30 15:53:37 abw Exp $
  +#   $Id: Table.pm,v 2.71 2006/05/30 17:01:36 abw Exp $
   #
   #============================================================================
   
  @@ -27,7 +27,7 @@
   use warnings;
   use base 'Template::Plugin';
   
  -our $VERSION = sprintf("%d.%02d", q$Revision: 2.70 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.71;
   our $AUTOLOAD;
   
   
  @@ -435,7 +435,7 @@
   
   =head1 VERSION
   
  -2.69, distributed as part of the
  +2.71, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.74      +4 -4      Template2/lib/Template/Plugin/URL.pm
  
  Index: URL.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/URL.pm,v
  retrieving revision 2.73
  retrieving revision 2.74
  diff -u -r2.73 -r2.74
  --- URL.pm	2006/05/30 15:53:37	2.73
  +++ URL.pm	2006/05/30 17:01:36	2.74
  @@ -8,7 +8,7 @@
   #   and adaptable parameters.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@cpan.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
   #   Copyright (C) 2000-2006 Andy Wardley.  All Rights Reserved.
  @@ -17,7 +17,7 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: URL.pm,v 2.73 2006/05/30 15:53:37 abw Exp $
  +#   $Id: URL.pm,v 2.74 2006/05/30 17:01:36 abw Exp $
   #
   #============================================================================
   
  @@ -27,7 +27,7 @@
   use warnings;
   use base 'Template::Plugin';
   
  -our $VERSION = sprintf("%d.%02d", q$Revision: 2.73 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.74;
   our $JOINT   = '&amp;';
   
   
  @@ -207,7 +207,7 @@
   
   =head1 VERSION
   
  -2.72, distributed as part of the
  +2.74, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.69      +7 -10     Template2/lib/Template/Plugin/View.pm
  
  Index: View.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/View.pm,v
  retrieving revision 2.68
  retrieving revision 2.69
  diff -u -r2.68 -r2.69
  --- View.pm	2006/05/30 15:53:37	2.68
  +++ View.pm	2006/05/30 17:01:36	2.69
  @@ -7,29 +7,26 @@
   #   a "Skin".
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 2000 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 2000-2006 Andy Wardley.  All Rights Reserved.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: View.pm,v 2.68 2006/05/30 15:53:37 abw Exp $
  +#   $Id: View.pm,v 2.69 2006/05/30 17:01:36 abw Exp $
   #
   #============================================================================
   
   package Template::Plugin::View;
   
  -require 5.004;
  -
   use strict;
  -use Template::Plugin;
  -use vars qw( $VERSION );
  -use base qw( Template::Plugin );
  +use warnings;
  +use base 'Template::Plugin';
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.68 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.68;
   
   use Template::View;
   
  @@ -101,7 +98,7 @@
   
   =head1 VERSION
   
  -2.67, distributed as part of the
  +2.68, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT
  
  
  
  2.69      +8 -12     Template2/lib/Template/Plugin/Wrap.pm
  
  Index: Wrap.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Wrap.pm,v
  retrieving revision 2.68
  retrieving revision 2.69
  diff -u -r2.68 -r2.69
  --- Wrap.pm	2006/05/30 15:53:37	2.68
  +++ Wrap.pm	2006/05/30 17:01:36	2.69
  @@ -6,31 +6,27 @@
   #   Plugin for wrapping text via the Text::Wrap module.
   #
   # AUTHOR
  -#   Andy Wardley   <abw@kfs.org>
  +#   Andy Wardley   <abw@wardley.org>
   #
   # COPYRIGHT
  -#   Copyright (C) 1996-2000 Andy Wardley.  All Rights Reserved.
  +#   Copyright (C) 1996-2006 Andy Wardley.  All Rights Reserved.
   #
   #   This module is free software; you can redistribute it and/or
   #   modify it under the same terms as Perl itself.
   #
  -#----------------------------------------------------------------------------
  +# REVISION
  +#   $Id: Wrap.pm,v 2.69 2006/05/30 17:01:36 abw Exp $
   #
  -# $Id: Wrap.pm,v 2.68 2006/05/30 15:53:37 abw Exp $
  -#
   #============================================================================
   
   package Template::Plugin::Wrap;
   
  -require 5.004;
  -
   use strict;
  -use vars qw( @ISA $VERSION );
  -use base qw( Template::Plugin );
  -use Template::Plugin;
  +use warnings;
  +use base 'Template::Plugin';
   use Text::Wrap;
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.68 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = 2.68;
   
   sub new {
       my ($class, $context, $format) = @_;;
  @@ -145,7 +141,7 @@
   
   =head1 VERSION
   
  -2.67, distributed as part of the
  +2.68, distributed as part of the
   Template Toolkit version 2.15b, released on 30 May 2006.
   
   =head1 COPYRIGHT