From abw@ourshack.com Mon Jul 08 19:33:49 2002 Received: from abw by dog.ourshack.com with local (Exim 3.33 #1) id 17RdKX-00043j-00 for templates-cvs@template-toolkit.org; Mon, 08 Jul 2002 19:33:49 +0100 Date: Mon, 8 Jul 2002 19:33:49 +0100 From: Andy Wardley To: templates-cvs@template-toolkit.org Message-ID: <20020708193349.B13766@dog.ourshack.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Subject: [Templates-cvs] Test Message Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: This is a test. A From cvs@template-toolkit.org Tue Jul 09 12:18:27 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17Rt0l-000Bg8-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 12:18:27 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 12:18:27 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/src/Release Changes.tt2 Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 11:18:27 Modified: docsrc/src/Release Changes.tt2 Log: * unique list vmeth Revision Changes Path 1.56 +4 -1 Template2/docsrc/src/Release/Changes.tt2 Index: Changes.tt2 =================================================================== RCS file: /template-toolkit/Template2/docsrc/src/Release/Changes.tt2,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- Changes.tt2 2002/07/08 16:11:46 1.55 +++ Changes.tt2 2002/07/09 11:18:27 1.56 @@ -20,7 +20,7 @@ # Any changes you make here may be lost! # #------------------------------------------------------------------------ -# $Id: Changes.tt2,v 1.55 2002/07/08 16:11:46 abw Exp $ +# $Id: Changes.tt2,v 1.56 2002/07/09 11:18:27 abw Exp $ #======================================================================== #------------------------------------------------------------------------ @@ -39,6 +39,9 @@ the namespace prefix intact on the ident list which then gets passed to the handler's ident() method. Modified the ident() method of Template::Namespace::Constants to expect and remove it. + +* Added the 'unique' list virtual method to cull multiple identical + items from a list. #------------------------------------------------------------------------ From cvs@template-toolkit.org Tue Jul 09 15:41:43 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwBT-000DNZ-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:41:43 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:41:43 +0100 Subject: [Templates-cvs] cvs commit: Template2 Changes HACKING INSTALL README TODO Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:41:43 Modified: . Changes HACKING INSTALL README TODO Log: prep for 2.07c Revision Changes Path 2.65 +25 -2 Template2/Changes Index: Changes =================================================================== RCS file: /template-toolkit/Template2/Changes,v retrieving revision 2.64 retrieving revision 2.65 diff -u -r2.64 -r2.65 --- Changes 2002/07/07 17:25:03 2.64 +++ Changes 2002/07/09 14:41:41 2.65 @@ -3,7 +3,7 @@ # Changes # # DESCRIPTION -# Revision history for the Template Toolkit version 2.07b, detailing +# Revision history for the Template Toolkit version 2.07c, detailing # significant changes between versions, most recent first. Some # way down the file you'll find a section detailing major changes from # version 1.* to 2.* and a list of "Gotchas!" that you might have to @@ -19,8 +19,31 @@ # Any changes you make here may be lost! # #------------------------------------------------------------------------ -# $Id: Changes,v 2.64 2002/07/07 17:25:03 abw Exp $ +# $Id: Changes,v 2.65 2002/07/09 14:41:41 abw Exp $ #======================================================================== + +#------------------------------------------------------------------------ +# Version 2.07c - July 9th 2002 ## DEVELOPER RELEASE ## +#------------------------------------------------------------------------ + +* Fixed a bug in Date plugin introduced in last version which caused + it to ignore the 'time' parameter. + +* Modified INCLUDE_PATH handling in Template::Provider to accept a + reference to a subroutine or object implementing a paths() method + as an element in the list. This is then called to return a + dynamically generated path. Documented and tested. + +* Changed the implementation of the NAMESPACE calling code to leave + the namespace prefix intact on the ident list which then gets + passed to the handler's ident() method. Modified the ident() + method of Template::Namespace::Constants to expect and remove it. + +* Added the 'unique' list virtual method to cull multiple identical + items from a list (darren) + +* Modified the OUTPUT option to accept a reference to a list (darren) + #------------------------------------------------------------------------ # Version 2.07b - July 7th 2002 ## DEVELOPER RELEASE ## 2.19 +2 -2 Template2/HACKING Index: HACKING =================================================================== RCS file: /template-toolkit/Template2/HACKING,v retrieving revision 2.18 retrieving revision 2.19 diff -u -r2.18 -r2.19 --- HACKING 2002/07/07 14:42:46 2.18 +++ HACKING 2002/07/09 14:41:41 2.19 @@ -1,9 +1,9 @@ Template Toolkit - Version 2.07b + Version 2.07c - 07 July 2002 + 09 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. 2.20 +9 -9 Template2/INSTALL Index: INSTALL =================================================================== RCS file: /template-toolkit/Template2/INSTALL,v retrieving revision 2.19 retrieving revision 2.20 diff -u -r2.19 -r2.20 --- INSTALL 2002/07/07 14:42:47 2.19 +++ INSTALL 2002/07/09 14:41:41 2.20 @@ -1,9 +1,9 @@ Template Toolkit - Version 2.07b + Version 2.07c - 07 July 2002 + 09 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. @@ -42,8 +42,8 @@ To install the Template Toolkit: - tar zxf Template-Toolkit-2.07b.tar.gz - cd Template-Toolkit-2.07b + tar zxf Template-Toolkit-2.07c.tar.gz + cd Template-Toolkit-2.07c perl Makefile.PL make make test @@ -129,19 +129,19 @@ Template-Toolkit-.tar.gz -where represents the current version number, e.g. 2.07b. +where represents the current version number, e.g. 2.07c. To install the Template Toolkit, unpack the distribution archive to create an installation directory. Something like this: - tar zxf Template-Toolkit-2.07b.tar.gz + tar zxf Template-Toolkit-2.07c.tar.gz or - gunzip Template-Toolkit-2.07b.tar.gz - tar xf Template-Toolkit-2.07b.tar + gunzip Template-Toolkit-2.07c.tar.gz + tar xf Template-Toolkit-2.07c.tar You can then 'cd' into the directory created, - cd Template-Toolkit-2.07b + cd Template-Toolkit-2.07c and perform the usual Perl installation procedure: 2.47 +5 -5 Template2/README Index: README =================================================================== RCS file: /template-toolkit/Template2/README,v retrieving revision 2.46 retrieving revision 2.47 diff -u -r2.46 -r2.47 --- README 2002/07/07 14:42:47 2.46 +++ README 2002/07/09 14:41:41 2.47 @@ -1,9 +1,9 @@ Template Toolkit - Version 2.07b + Version 2.07c - 07 July 2002 + 09 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. @@ -43,8 +43,8 @@ To install the Template Toolkit: - tar zxf Template-Toolkit-2.07b.tar.gz - cd Template-Toolkit-2.07b + tar zxf Template-Toolkit-2.07c.tar.gz + cd Template-Toolkit-2.07c perl Makefile.PL make make test @@ -344,7 +344,7 @@ --------------------- In terms of the template language and features available, versions -2.01 through to 2.07b should be fully backwardly compatible with +2.01 through to 2.07c should be fully backwardly compatible with version 2.00. Version 2.00 is backwardly compatible with version 1 in all but a few 2.65 +1 -1 Template2/TODO Index: TODO =================================================================== RCS file: /template-toolkit/Template2/TODO,v retrieving revision 2.64 retrieving revision 2.65 diff -u -r2.64 -r2.65 --- TODO 2002/07/07 17:25:05 2.64 +++ TODO 2002/07/09 14:41:42 2.65 @@ -3,7 +3,7 @@ # TODO # # DESCRIPTION -# TODO list for the Template Toolkit version 2.07b, containing +# TODO list for the Template Toolkit version 2.07c, containing # known bugs, limitations, planned enhancements, long term visions # and a few whacky ideas. # @@ -11,7 +11,7 @@ # Andy Wardley # #------------------------------------------------------------------------ -# $Id: TODO,v 2.64 2002/07/07 17:25:05 abw Exp $ +# $Id: TODO,v 2.65 2002/07/09 14:41:42 abw Exp $ #======================================================================== #------------------------------------------------------------------------ From cvs@template-toolkit.org Tue Jul 09 15:41:44 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwBU-000DNr-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:41:44 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:41:44 +0100 Subject: [Templates-cvs] cvs commit: Template2/bin tpage ttree Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:41:44 Modified: bin tpage ttree Log: prep for 2.07c Revision Changes Path 2.48 +4 -4 Template2/bin/tpage Index: tpage =================================================================== RCS file: /template-toolkit/Template2/bin/tpage,v retrieving revision 2.47 retrieving revision 2.48 diff -u -r2.47 -r2.48 --- tpage 2002/07/07 17:25:07 2.47 +++ tpage 2002/07/09 14:41:43 2.48 @@ -19,7 +19,7 @@ # #------------------------------------------------------------------------ # -# $Id: tpage,v 2.47 2002/07/07 17:25:07 abw Exp $ +# $Id: tpage,v 2.48 2002/07/09 14:41:43 abw Exp $ # #======================================================================== @@ -103,7 +103,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -112,8 +112,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.51 +5 -5 Template2/bin/ttree Index: ttree =================================================================== RCS file: /template-toolkit/Template2/bin/ttree,v retrieving revision 2.50 retrieving revision 2.51 diff -u -r2.50 -r2.51 --- ttree 2002/07/07 17:25:08 2.50 +++ ttree 2002/07/09 14:41:44 2.51 @@ -23,7 +23,7 @@ # #------------------------------------------------------------------------ # -# $Id: ttree,v 2.50 2002/07/07 17:25:08 abw Exp $ +# $Id: ttree,v 2.51 2002/07/09 14:41:44 abw Exp $ # #======================================================================== @@ -39,7 +39,7 @@ # config #------------------------------------------------------------------------ my $NAME = "ttree"; -my $VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); +my $VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); my $HOME = $ENV{ HOME } || ''; my $RCFILE = $ENV{"\U${NAME}rc"} || "$HOME/.${NAME}rc"; @@ -626,7 +626,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -635,8 +635,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:41:45 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwBV-000DO3-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:41:45 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:41:45 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/FAQ FAQ.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:41:45 Modified: docs/src/FAQ FAQ.html Log: prep for 2.07c Revision Changes Path 1.47 +3 -3 Template2/docs/src/FAQ/FAQ.html Index: FAQ.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/FAQ/FAQ.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- FAQ.html 2002/07/07 17:25:09 1.46 +++ FAQ.html 2002/07/09 14:41:45 1.47 @@ -310,7 +310,7 @@ [% WRAPPER section title="AUTHOR" -%]

-Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

[% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -319,8 +319,8 @@ [% WRAPPER section title="VERSION" -%]

-2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

[%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:41:48 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwBY-000DOL-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:41:48 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:41:48 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Library HTML.html PostScript.html Splash.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:41:48 Modified: docs/src/Library HTML.html PostScript.html Splash.html Log: prep for 2.07c Revision Changes Path 1.46 +3 -3 Template2/docs/src/Library/HTML.html Index: HTML.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Library/HTML.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- HTML.html 2002/07/07 17:25:11 1.45 +++ HTML.html 2002/07/09 14:41:46 1.46 @@ -283,7 +283,7 @@ [% WRAPPER section title="AUTHOR" -%]

-Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

[% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -292,8 +292,8 @@ [% WRAPPER section title="VERSION" -%]

-2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

[%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Library/PostScript.html Index: PostScript.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Library/PostScript.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- PostScript.html 2002/07/07 17:25:11 1.45 +++ PostScript.html 2002/07/09 14:41:46 1.46 @@ -38,7 +38,7 @@ [% WRAPPER section title="AUTHOR" -%]

-Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

[% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -47,8 +47,8 @@ [% WRAPPER section title="VERSION" -%]

-2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

[%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Library/Splash.html Index: Splash.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Library/Splash.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Splash.html 2002/07/07 17:25:12 1.45 +++ Splash.html 2002/07/09 14:41:46 1.46 @@ -883,7 +883,7 @@ [% WRAPPER section title="AUTHOR" -%]

-Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

[% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -892,8 +892,8 @@ [% WRAPPER section title="VERSION" -%]

-2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

[%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:41:53 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwBd-000DP1-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:41:53 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:41:53 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Manual Config.html Credits.html Directives.html Filters.html Internals.html Intro.html Plugins.html Refs.html Syntax.html Variables.html Views.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:41:53 Modified: docs/src/Manual Config.html Credits.html Directives.html Filters.html Internals.html Intro.html Plugins.html Refs.html Syntax.html Variables.html Views.html Log: prep for 2.07c Revision Changes Path 1.34 +65 -7 Template2/docs/src/Manual/Config.html Index: Config.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Config.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Config.html 2002/07/07 17:25:13 1.33 +++ Config.html 2002/07/09 14:41:48 1.34 @@ -326,6 +326,55 @@ that have ':' followed by a '/' or '\'. This avoids confusion when using directory names like 'C:\Blah Blah'.

+

+When specified as a list, the INCLUDE_PATH path can contain elements +which dynamically generate a list of INCLUDE_PATH directories. These +generator elements can be specified as a reference to a subroutine or +an object which implements a paths() method. +

+
    my $template = Template->new({
  +        INCLUDE_PATH => [ '/usr/local/templates', 
  +                          \&incpath_generator, 
  +			  My::IncPath::Generator->new( ... ) ],
  +    });
+

+Each time a template is requested and the INCLUDE_PATH examined, the +subroutine or object method will be called. A reference to a list of +directories should be returned. Generator subroutines should report +errors using die(). Generator objects should return undef and make an +error available via its error() method. +

+

+For example: +

+
    sub incpath_generator {
+
	# ...some code...
  +	
  +	if ($all_is_well) {
  +	    return \@list_of_directories;
  +	}
  +	else {
  +	    die "cannot generate INCLUDE_PATH...\n";
  +	}
  +    }
+

+or: +

+
    package My::IncPath::Generator;
+
    # Template::Base (or Class::Base) provides error() method
  +    use Template::Base;
  +    use base qw( Template::Base );
+
    sub paths {
  +	my $self = shift;
+
	# ...some code...
+
        if ($all_is_well) {
  +	    return \@list_of_directories;
  +	}
  +	else {
  +	    return $self->error("cannot generate INCLUDE_PATH...\n");
  +	}
  +    }
+
    1;
  • DELIMITER

    @@ -859,7 +908,8 @@ (e.g. GLOB or IO::Handle) opened for writing; a reference to a text string to which the output is appended (the string isn't cleared); a reference to a subroutine which is called, passing the output text as -an argument; or as a reference to any object that supports the print() +an argument; as a reference to an array, onto which the content will be +push()ed; or as a reference to any object that supports the print() method. This latter option includes the Apache::Request object which is passed as the argument to Apache/mod_perl handlers.

    @@ -891,8 +941,14 @@ OUTPUT => \&output, });

    -example 5 (Apache/mod_perl handler): +example 5 (array reference):

    +
        my $template = Template->new({
      +	OUTPUT => \@output,
      +    })
    +

    +example 6 (Apache/mod_perl handler): +

        sub handler {
       	my $r = shift;
    	my $t = Template->new({
      @@ -908,6 +964,7 @@
       
        $t->process($file, $vars, "/tmp/foo");
           $t->process($file, $vars, "bar");
           $t->process($file, $vars, \*MYGLOB);
      +    $t->process($file, $vars, \@output); 
           $t->process($file, $vars, $r);  # Apache::Request
           ...
    @@ -977,11 +1034,12 @@ This template fragment would generate the following output:

        ## input text line 1 : [% tt_start_tag %] foo = 'World' [% tt_end_tag %] ##
      -    Hello World
      -      
      +    Hello World
    +

    It is anticipated that a future version of the Template Toolkit will support allow the different debugging options to be enabled or -disabled individually.

    +disabled individually. +

  • DEBUG_FORMAT

    @@ -1653,7 +1711,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -1662,7 +1720,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.34 +2 -2 Template2/docs/src/Manual/Credits.html Index: Credits.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Credits.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Credits.html 2002/07/07 14:42:49 1.33 +++ Credits.html 2002/07/09 14:41:49 1.34 @@ -147,7 +147,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -156,7 +156,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.34 +2 -2 Template2/docs/src/Manual/Directives.html Index: Directives.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Directives.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Directives.html 2002/07/07 17:25:13 1.33 +++ Directives.html 2002/07/09 14:41:49 1.34 @@ -1963,7 +1963,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -1972,7 +1972,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.33 +2 -2 Template2/docs/src/Manual/Filters.html Index: Filters.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Filters.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Filters.html 2002/07/07 14:42:50 1.32 +++ Filters.html 2002/07/09 14:41:51 1.33 @@ -504,7 +504,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -513,7 +513,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.33 +2 -2 Template2/docs/src/Manual/Internals.html Index: Internals.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Internals.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Internals.html 2002/07/07 14:42:50 1.32 +++ Internals.html 2002/07/09 14:41:51 1.33 @@ -535,7 +535,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -544,7 +544,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.33 +2 -2 Template2/docs/src/Manual/Intro.html Index: Intro.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Intro.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Intro.html 2002/07/07 14:42:50 1.32 +++ Intro.html 2002/07/09 14:41:51 1.33 @@ -258,7 +258,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -267,7 +267,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.33 +2 -2 Template2/docs/src/Manual/Plugins.html Index: Plugins.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Plugins.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Plugins.html 2002/07/07 14:42:50 1.32 +++ Plugins.html 2002/07/09 14:41:51 1.33 @@ -558,7 +558,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -567,7 +567,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.33 +17 -2 Template2/docs/src/Manual/Refs.html Index: Refs.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Refs.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Refs.html 2002/07/07 14:42:50 1.32 +++ Refs.html 2002/07/09 14:41:52 1.33 @@ -113,13 +113,28 @@

        http://slashcode.org/
    +
  • OpenFrame
    +

    +OpenFrame is an open source application framework for distributed +media applications. It ships with a generator for the Template +Toolkit. +

    +
        http://openframe.fotango.com/
    + +
  • PCMT
    +

    +PCMT is the Personal Content Management Toolkit. It uses the Template +Toolkit as the presentation engine. +

    +
        http://pcmt.sf.net/
    + [%- END %] [%- END %] [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -128,7 +143,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.33 +2 -2 Template2/docs/src/Manual/Syntax.html Index: Syntax.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Syntax.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Syntax.html 2002/07/07 14:42:51 1.32 +++ Syntax.html 2002/07/09 14:41:52 1.33 @@ -276,7 +276,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -285,7 +285,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.33 +16 -2 Template2/docs/src/Manual/Variables.html Index: Variables.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Variables.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Variables.html 2002/07/07 14:42:51 1.32 +++ Variables.html 2002/07/09 14:41:52 1.33 @@ -741,6 +741,20 @@
        [% tt_start_tag %] first = mylist.shift [% tt_end_tag %]
           [% tt_start_tag %] last  = mylist.pop   [% tt_end_tag %]
    +
  • unique
    +

    +Returns a list of the unique elements in a list, in the same order +as in the list itself. +

    +
        [% tt_start_tag %] mylist = [ 1, 2, 3, 2, 3, 4, 1, 4, 3, 4, 5 ] [% tt_end_tag %]
      +    [% tt_start_tag %] numbers = mylist.unique [% tt_end_tag %]
    +

    +While this can be explicitly sorted, it is not required that the list +be sorted before the unique elements pulled out (unlike the Unix +command line utility). +

    +
        [% tt_start_tag %] numbers = mylist.unique.sort [% tt_end_tag %]
    +

    The following example demonstrates how an empty list ('folk') can be @@ -1180,7 +1194,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -1189,7 +1203,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.33 +2 -2 Template2/docs/src/Manual/Views.html Index: Views.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Views.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Views.html 2002/07/07 14:42:51 1.32 +++ Views.html 2002/07/09 14:41:52 1.33 @@ -608,7 +608,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -617,7 +617,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:41:55 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwBf-000DPD-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:41:55 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:41:55 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules Template.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:41:55 Modified: docs/src/Modules Template.html Log: prep for 2.07c Revision Changes Path 1.33 +2 -2 Template2/docs/src/Modules/Template.html Index: Template.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Template.html 2002/07/07 14:42:51 1.32 +++ Template.html 2002/07/09 14:41:54 1.33 @@ -759,7 +759,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -768,7 +768,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:41:59 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwBj-000DQ6-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:41:59 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:41:59 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template Base.html Config.html Constants.html Context.html Document.html Exception.html Filters.html Iterator.html Parser.html Plugin.html Plugins.html Provider.html Service.html Stash.html Test.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:41:59 Modified: docs/src/Modules/Template Base.html Config.html Constants.html Context.html Document.html Exception.html Filters.html Iterator.html Parser.html Plugin.html Plugins.html Provider.html Service.html Stash.html Test.html Log: prep for 2.07c Revision Changes Path 1.46 +3 -3 Template2/docs/src/Modules/Template/Base.html Index: Base.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Base.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Base.html 2002/07/07 17:25:16 1.45 +++ Base.html 2002/07/09 14:41:55 1.46 @@ -105,7 +105,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -114,8 +114,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Config.html Index: Config.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Config.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Config.html 2002/07/07 17:25:19 1.45 +++ Config.html 2002/07/09 14:41:56 1.46 @@ -151,7 +151,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -160,8 +160,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Constants.html Index: Constants.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Constants.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Constants.html 2002/07/07 17:25:20 1.45 +++ Constants.html 2002/07/09 14:41:56 1.46 @@ -94,7 +94,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -103,8 +103,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.50, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Context.html Index: Context.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Context.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Context.html 2002/07/07 17:25:20 1.45 +++ Context.html 2002/07/09 14:41:56 1.46 @@ -623,7 +623,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -632,8 +632,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.62, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.63, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Document.html Index: Document.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Document.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Document.html 2002/07/07 17:25:21 1.45 +++ Document.html 2002/07/09 14:41:56 1.46 @@ -203,7 +203,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -212,8 +212,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Exception.html Index: Exception.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Exception.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Exception.html 2002/07/07 17:25:21 1.45 +++ Exception.html 2002/07/09 14:41:56 1.46 @@ -82,7 +82,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -91,8 +91,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.47, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.48, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Filters.html Index: Filters.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Filters.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Filters.html 2002/07/07 17:25:22 1.45 +++ Filters.html 2002/07/09 14:41:56 1.46 @@ -694,7 +694,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -703,8 +703,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.55, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.56, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Iterator.html Index: Iterator.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Iterator.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Iterator.html 2002/07/07 17:25:22 1.45 +++ Iterator.html 2002/07/09 14:41:56 1.46 @@ -232,7 +232,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -241,8 +241,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Parser.html Index: Parser.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Parser.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Parser.html 2002/07/07 17:25:23 1.45 +++ Parser.html 2002/07/09 14:41:57 1.46 @@ -443,7 +443,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -452,8 +452,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.62, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.63, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

     
    [%- END %] 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin.html Index: Plugin.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Plugin.html 2002/07/07 17:25:23 1.45 +++ Plugin.html 2002/07/09 14:41:57 1.46 @@ -233,7 +233,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -242,8 +242,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.50, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugins.html Index: Plugins.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugins.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Plugins.html 2002/07/07 17:25:24 1.45 +++ Plugins.html 2002/07/09 14:41:57 1.46 @@ -770,7 +770,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -779,8 +779,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.54, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.55, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +71 -4 Template2/docs/src/Modules/Template/Provider.html Index: Provider.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Provider.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Provider.html 2002/07/07 17:25:25 1.45 +++ Provider.html 2002/07/09 14:41:57 1.46 @@ -24,7 +24,8 @@ "new(\\%options) ", "fetch(\$name)", "store(\$name, \$template)", - "include_path(\\@newpath))" + "include_path(\\@newpath))", + "paths()" ]; PROCESS tocitem title ="AUTHOR" @@ -104,6 +105,55 @@ that have ':' followed by a '/' or '\'. This avoids confusion when using directory names like 'C:\Blah Blah'.

    +

    +When specified as a list, the INCLUDE_PATH path can contain elements +which dynamically generate a list of INCLUDE_PATH directories. These +generator elements can be specified as a reference to a subroutine or +an object which implements a paths() method. +

    +
        my $provider = Template::Provider->new({
      +        INCLUDE_PATH => [ '/usr/local/templates', 
      +                          \&incpath_generator, 
      +			  My::IncPath::Generator->new( ... ) ],
      +    });
    +

    +Each time a template is requested and the INCLUDE_PATH examined, the +subroutine or object method will be called. A reference to a list of +directories should be returned. Generator subroutines should report +errors using die(). Generator objects should return undef and make an +error available via its error() method. +

    +

    +For example: +

    +
        sub incpath_generator {
    +
    	# ...some code...
      +	
      +	if ($all_is_well) {
      +	    return \@list_of_directories;
      +	}
      +	else {
      +	    die "cannot generate INCLUDE_PATH...\n";
      +	}
      +    }
    +

    +or: +

    +
        package My::IncPath::Generator;
    +
        # Template::Base (or Class::Base) provides error() method
      +    use Template::Base;
      +    use base qw( Template::Base );
    +
        sub paths {
      +	my $self = shift;
    +
    	# ...some code...
    +
            if ($all_is_well) {
      +	    return \@list_of_directories;
      +	}
      +	else {
      +	    return $self->error("cannot generate INCLUDE_PATH...\n");
      +	}
      +    }
    +
        1;
  • DELIMITER

    @@ -361,11 +411,28 @@ the new value.

    [%- END %] +[% WRAPPER subsection + title = "paths()" +-%]

    +This method generates a copy of the INCLUDE_PATH list. Any elements in the +list which are dynamic generators (e.g. references to subroutines or objects +implementing a paths() method) will be called and the list of directories +returned merged into the output list. +

    +

    +It is possible to provide a generator which returns itself, thus sending +this method into an infinite loop. To detect and prevent this from happening, +the '$MAX_DIRS' package variable, set to 64 by default, limits the maximum +number of paths that can be added to, or generated for the output list. If +this number is exceeded then the method will immediately return an error +reporting as much. +

    +[%- END %] [%- END %] [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -374,8 +441,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.55, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.58, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Service.html Index: Service.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Service.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Service.html 2002/07/07 17:25:25 1.45 +++ Service.html 2002/07/09 14:41:57 1.46 @@ -434,7 +434,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -443,8 +443,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.55, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.58, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Stash.html Index: Stash.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Stash.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Stash.html 2002/07/07 17:25:25 1.45 +++ Stash.html 2002/07/09 14:41:57 1.46 @@ -173,7 +173,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -182,8 +182,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.60, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.63, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Test.html Index: Test.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Test.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Test.html 2002/07/07 17:25:26 1.45 +++ Test.html 2002/07/09 14:41:57 1.46 @@ -287,7 +287,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -296,8 +296,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:13 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwBx-000DRY-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:13 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:13 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin Autoformat.html CGI.html DBI.html Datafile.html Date.html Directory.html Dumper.html File.html Format.html HTML.html Iterator.html Pod.html Table.html URL.html View.html Wrap.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:13 Modified: docs/src/Modules/Template/Plugin Autoformat.html CGI.html DBI.html Datafile.html Date.html Directory.html Dumper.html File.html Format.html HTML.html Iterator.html Pod.html Table.html URL.html View.html Wrap.html Log: prep for 2.07c Revision Changes Path 1.46 +2 -2 Template2/docs/src/Modules/Template/Plugin/Autoformat.html Index: Autoformat.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Autoformat.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Autoformat.html 2002/07/07 17:25:27 1.45 +++ Autoformat.html 2002/07/09 14:41:59 1.46 @@ -154,8 +154,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin/CGI.html Index: CGI.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/CGI.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- CGI.html 2002/07/07 17:25:27 1.45 +++ CGI.html 2002/07/09 14:41:59 1.46 @@ -73,7 +73,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -82,8 +82,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.36 +2 -2 Template2/docs/src/Modules/Template/Plugin/DBI.html Index: DBI.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/DBI.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- DBI.html 2002/07/07 17:25:28 1.35 +++ DBI.html 2002/07/09 14:42:00 1.36 @@ -443,8 +443,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.45, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.46, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin/Datafile.html Index: Datafile.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Datafile.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Datafile.html 2002/07/07 17:25:29 1.45 +++ Datafile.html 2002/07/09 14:42:00 1.46 @@ -95,7 +95,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -104,8 +104,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +2 -2 Template2/docs/src/Modules/Template/Plugin/Date.html Index: Date.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Date.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Date.html 2002/07/07 17:25:29 1.45 +++ Date.html 2002/07/09 14:42:01 1.46 @@ -155,8 +155,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +2 -2 Template2/docs/src/Modules/Template/Plugin/Directory.html Index: Directory.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Directory.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Directory.html 2002/07/07 17:25:30 1.45 +++ Directory.html 2002/07/09 14:42:01 1.46 @@ -246,8 +246,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +2 -2 Template2/docs/src/Modules/Template/Plugin/Dumper.html Index: Dumper.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Dumper.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Dumper.html 2002/07/07 17:25:30 1.45 +++ Dumper.html 2002/07/09 14:42:01 1.46 @@ -103,8 +103,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +2 -2 Template2/docs/src/Modules/Template/Plugin/File.html Index: File.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/File.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- File.html 2002/07/07 17:25:31 1.45 +++ File.html 2002/07/09 14:42:01 1.46 @@ -267,8 +267,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin/Format.html Index: Format.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Format.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Format.html 2002/07/07 17:25:31 1.45 +++ Format.html 2002/07/09 14:42:02 1.46 @@ -52,7 +52,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -61,8 +61,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.23 +3 -3 Template2/docs/src/Modules/Template/Plugin/HTML.html Index: HTML.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/HTML.html,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- HTML.html 2002/07/07 17:25:35 1.22 +++ HTML.html 2002/07/09 14:42:02 1.23 @@ -110,7 +110,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -119,8 +119,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.41, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.42, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin/Iterator.html Index: Iterator.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Iterator.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Iterator.html 2002/07/07 17:25:35 1.45 +++ Iterator.html 2002/07/09 14:42:02 1.46 @@ -54,7 +54,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -63,8 +63,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.47, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.48, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin/Pod.html Index: Pod.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Pod.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Pod.html 2002/07/07 17:25:36 1.45 +++ Pod.html 2002/07/09 14:42:03 1.46 @@ -52,7 +52,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -61,8 +61,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.46, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.47, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin/Table.html Index: Table.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Table.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Table.html 2002/07/07 17:25:36 1.45 +++ Table.html 2002/07/09 14:42:03 1.46 @@ -209,7 +209,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -218,8 +218,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin/URL.html Index: URL.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/URL.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- URL.html 2002/07/07 17:25:37 1.45 +++ URL.html 2002/07/09 14:42:03 1.46 @@ -121,7 +121,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -130,8 +130,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Modules/Template/Plugin/View.html Index: View.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/View.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- View.html 2002/07/07 17:25:38 1.45 +++ View.html 2002/07/09 14:42:04 1.46 @@ -58,7 +58,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -67,8 +67,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +2 -2 Template2/docs/src/Modules/Template/Plugin/Wrap.html Index: Wrap.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Wrap.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Wrap.html 2002/07/07 17:25:38 1.45 +++ Wrap.html 2002/07/09 14:42:04 1.46 @@ -100,8 +100,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:18 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwC2-000DRz-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:18 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:18 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin/GD Constants.html Image.html Polygon.html Text.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:18 Modified: docs/src/Modules/Template/Plugin/GD Constants.html Image.html Polygon.html Text.html Log: prep for 2.07c Revision Changes Path 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Constants.html Index: Constants.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Constants.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Constants.html 2002/07/07 17:25:39 1.20 +++ Constants.html 2002/07/09 14:42:14 1.21 @@ -80,8 +80,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Image.html Index: Image.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Image.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Image.html 2002/07/07 17:25:40 1.20 +++ Image.html 2002/07/09 14:42:15 1.21 @@ -128,8 +128,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Polygon.html Index: Polygon.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Polygon.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Polygon.html 2002/07/07 17:25:40 1.20 +++ Polygon.html 2002/07/09 14:42:15 1.21 @@ -100,8 +100,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Text.html Index: Text.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Text.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Text.html 2002/07/07 17:25:41 1.20 +++ Text.html 2002/07/09 14:42:15 1.21 @@ -81,8 +81,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:28 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCB-000DSn-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:27 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:27 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin/GD/Graph area.html bars.html bars3d.html lines.html lines3d.html linespoints.html mixed.html pie.html pie3d.html points.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:27 Modified: docs/src/Modules/Template/Plugin/GD/Graph area.html bars.html bars3d.html lines.html lines3d.html linespoints.html mixed.html pie.html pie3d.html points.html Log: prep for 2.07c Revision Changes Path 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/area.html Index: area.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/area.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- area.html 2002/07/07 17:25:41 1.20 +++ area.html 2002/07/09 14:42:19 1.21 @@ -84,8 +84,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/bars.html Index: bars.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/bars.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bars.html 2002/07/07 17:25:42 1.20 +++ bars.html 2002/07/09 14:42:19 1.21 @@ -120,8 +120,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/bars3d.html Index: bars3d.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/bars3d.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bars3d.html 2002/07/07 17:25:42 1.20 +++ bars3d.html 2002/07/09 14:42:21 1.21 @@ -101,8 +101,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/lines.html Index: lines.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/lines.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- lines.html 2002/07/07 17:25:46 1.20 +++ lines.html 2002/07/09 14:42:22 1.21 @@ -109,8 +109,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/lines3d.html Index: lines3d.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/lines3d.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- lines3d.html 2002/07/07 17:25:47 1.20 +++ lines3d.html 2002/07/09 14:42:22 1.21 @@ -101,8 +101,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/linespoints.html Index: linespoints.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/linespoints.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- linespoints.html 2002/07/07 17:25:47 1.20 +++ linespoints.html 2002/07/09 14:42:22 1.21 @@ -94,8 +94,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/mixed.html Index: mixed.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/mixed.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mixed.html 2002/07/07 17:25:48 1.20 +++ mixed.html 2002/07/09 14:42:23 1.21 @@ -109,8 +109,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/pie.html Index: pie.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/pie.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- pie.html 2002/07/07 17:25:48 1.20 +++ pie.html 2002/07/09 14:42:23 1.21 @@ -82,8 +82,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/pie3d.html Index: pie3d.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/pie3d.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- pie3d.html 2002/07/07 17:25:49 1.20 +++ pie3d.html 2002/07/09 14:42:24 1.21 @@ -87,8 +87,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/points.html Index: points.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/points.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- points.html 2002/07/07 17:25:49 1.20 +++ points.html 2002/07/09 14:42:24 1.21 @@ -91,8 +91,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:36 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCK-000DUO-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:36 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:36 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Tools tpage.html ttree.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:35 Modified: docs/src/Tools tpage.html ttree.html Log: prep for 2.07c Revision Changes Path 1.46 +3 -3 Template2/docs/src/Tools/tpage.html Index: tpage.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Tools/tpage.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- tpage.html 2002/07/07 17:25:56 1.45 +++ tpage.html 2002/07/09 14:42:35 1.46 @@ -64,7 +64,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -73,8 +73,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +3 -3 Template2/docs/src/Tools/ttree.html Index: ttree.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Tools/ttree.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ttree.html 2002/07/07 17:25:57 1.45 +++ ttree.html 2002/07/09 14:42:35 1.46 @@ -115,7 +115,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -124,8 +124,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:29 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCD-000DT6-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:29 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:29 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin/GD/Text Align.html Wrap.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:29 Modified: docs/src/Modules/Template/Plugin/GD/Text Align.html Wrap.html Log: prep for 2.07c Revision Changes Path 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Text/Align.html Index: Align.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Text/Align.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Align.html 2002/07/07 17:25:50 1.20 +++ Align.html 2002/07/09 14:42:29 1.21 @@ -86,8 +86,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.21 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Text/Wrap.html Index: Wrap.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Text/Wrap.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Wrap.html 2002/07/07 17:25:51 1.20 +++ Wrap.html 2002/07/09 14:42:29 1.21 @@ -123,8 +123,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:31 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCF-000DTS-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:31 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:31 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin/XML DOM.html RSS.html Simple.html XPath.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:31 Modified: docs/src/Modules/Template/Plugin/XML DOM.html RSS.html Simple.html XPath.html Log: prep for 2.07c Revision Changes Path 1.33 +1 -1 Template2/docs/src/Modules/Template/Plugin/XML/DOM.html Index: DOM.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/XML/DOM.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- DOM.html 2002/07/07 14:43:03 1.32 +++ DOM.html 2002/07/09 14:42:30 1.33 @@ -419,7 +419,7 @@ title="VERSION" -%]

    2.6, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +2 -2 Template2/docs/src/Modules/Template/Plugin/XML/RSS.html Index: RSS.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/XML/RSS.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- RSS.html 2002/07/07 17:25:52 1.45 +++ RSS.html 2002/07/09 14:42:30 1.46 @@ -137,8 +137,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.45 +2 -2 Template2/docs/src/Modules/Template/Plugin/XML/Simple.html Index: Simple.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/XML/Simple.html,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Simple.html 2002/07/07 17:25:52 1.44 +++ Simple.html 2002/07/09 14:42:30 1.45 @@ -69,8 +69,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.46, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.47, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.46 +2 -2 Template2/docs/src/Modules/Template/Plugin/XML/XPath.html Index: XPath.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/XML/XPath.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- XPath.html 2002/07/07 17:25:52 1.45 +++ XPath.html 2002/07/09 14:42:30 1.46 @@ -119,8 +119,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:32 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCG-000DTl-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:32 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:32 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Stash Context.html XS.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:32 Modified: docs/src/Modules/Template/Stash Context.html XS.html Log: prep for 2.07c Revision Changes Path 1.21 +3 -3 Template2/docs/src/Modules/Template/Stash/Context.html Index: Context.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Stash/Context.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Context.html 2002/07/07 17:25:53 1.20 +++ Context.html 2002/07/09 14:42:31 1.21 @@ -107,7 +107,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -116,8 +116,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.43, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.44, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.16 +1 -1 Template2/docs/src/Modules/Template/Stash/XS.html Index: XS.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Stash/XS.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- XS.html 2002/07/07 14:43:04 1.15 +++ XS.html 2002/07/09 14:42:31 1.16 @@ -141,7 +141,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:34 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCI-000DU9-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:34 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:34 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Release Changes.html HACKING.html INSTALL.html README.html TODO.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:34 Modified: docs/src/Release Changes.html HACKING.html INSTALL.html README.html TODO.html Log: prep for 2.07c Revision Changes Path 1.48 +25 -2 Template2/docs/src/Release/Changes.html Index: Changes.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Release/Changes.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- Changes.html 2002/07/07 17:25:54 1.47 +++ Changes.html 2002/07/09 14:42:33 1.48 @@ -7,7 +7,7 @@ # Changes # # DESCRIPTION -# Revision history for the Template Toolkit version 2.07b, detailing +# Revision history for the Template Toolkit version 2.07c, detailing # significant changes between versions, most recent first. Some # way down the file you'll find a section detailing major changes from # version 1.* to 2.* and a list of "Gotchas!" that you might have to @@ -23,8 +23,31 @@ # Any changes you make here may be lost! # #------------------------------------------------------------------------ -# $Id: Changes.html,v 1.47 2002/07/07 17:25:54 abw Exp $ +# $Id: Changes.html,v 1.48 2002/07/09 14:42:33 abw Exp $ #======================================================================== + +#------------------------------------------------------------------------ +# Version 2.07c - July 9th 2002 ## DEVELOPER RELEASE ## +#------------------------------------------------------------------------ + +* Fixed a bug in Date plugin introduced in last version which caused + it to ignore the 'time' parameter. + +* Modified INCLUDE_PATH handling in Template::Provider to accept a + reference to a subroutine or object implementing a paths() method + as an element in the list. This is then called to return a + dynamically generated path. Documented and tested. + +* Changed the implementation of the NAMESPACE calling code to leave + the namespace prefix intact on the ident list which then gets + passed to the handler's ident() method. Modified the ident() + method of Template::Namespace::Constants to expect and remove it. + +* Added the 'unique' list virtual method to cull multiple identical + items from a list (darren) + +* Modified the OUTPUT option to accept a reference to a list (darren) + #------------------------------------------------------------------------ # Version 2.07b - July 7th 2002 ## DEVELOPER RELEASE ## 1.19 +2 -2 Template2/docs/src/Release/HACKING.html Index: HACKING.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Release/HACKING.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- HACKING.html 2002/07/07 14:43:05 1.18 +++ HACKING.html 2002/07/09 14:42:33 1.19 @@ -5,9 +5,9 @@ Template Toolkit - Version 2.07b + Version 2.07c - 07 July 2002 + 09 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. 1.20 +9 -9 Template2/docs/src/Release/INSTALL.html Index: INSTALL.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Release/INSTALL.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- INSTALL.html 2002/07/07 14:43:05 1.19 +++ INSTALL.html 2002/07/09 14:42:33 1.20 @@ -5,9 +5,9 @@ Template Toolkit - Version 2.07b + Version 2.07c - 07 July 2002 + 09 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. @@ -46,8 +46,8 @@ To install the Template Toolkit: - tar zxf Template-Toolkit-2.07b.tar.gz - cd Template-Toolkit-2.07b + tar zxf Template-Toolkit-2.07c.tar.gz + cd Template-Toolkit-2.07c perl Makefile.PL make make test @@ -133,19 +133,19 @@ Template-Toolkit-<version>.tar.gz -where <version> represents the current version number, e.g. 2.07b. +where <version> represents the current version number, e.g. 2.07c. To install the Template Toolkit, unpack the distribution archive to create an installation directory. Something like this: - tar zxf Template-Toolkit-2.07b.tar.gz + tar zxf Template-Toolkit-2.07c.tar.gz or - gunzip Template-Toolkit-2.07b.tar.gz - tar xf Template-Toolkit-2.07b.tar + gunzip Template-Toolkit-2.07c.tar.gz + tar xf Template-Toolkit-2.07c.tar You can then 'cd' into the directory created, - cd Template-Toolkit-2.07b + cd Template-Toolkit-2.07c and perform the usual Perl installation procedure: 1.40 +5 -5 Template2/docs/src/Release/README.html Index: README.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Release/README.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- README.html 2002/07/07 14:43:05 1.39 +++ README.html 2002/07/09 14:42:33 1.40 @@ -5,9 +5,9 @@ Template Toolkit - Version 2.07b + Version 2.07c - 07 July 2002 + 09 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. @@ -47,8 +47,8 @@ To install the Template Toolkit: - tar zxf Template-Toolkit-2.07b.tar.gz - cd Template-Toolkit-2.07b + tar zxf Template-Toolkit-2.07c.tar.gz + cd Template-Toolkit-2.07c perl Makefile.PL make make test @@ -348,7 +348,7 @@ --------------------- In terms of the template language and features available, versions -2.01 through to 2.07b should be fully backwardly compatible with +2.01 through to 2.07c should be fully backwardly compatible with version 2.00. Version 2.00 is backwardly compatible with version 1 in all but a few 1.48 +1 -1 Template2/docs/src/Release/TODO.html Index: TODO.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Release/TODO.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- TODO.html 2002/07/07 17:25:55 1.47 +++ TODO.html 2002/07/09 14:42:34 1.48 @@ -7,7 +7,7 @@ # TODO # # DESCRIPTION -# TODO list for the Template Toolkit version 2.07b, containing +# TODO list for the Template Toolkit version 2.07c, containing # known bugs, limitations, planned enhancements, long term visions # and a few whacky ideas. # @@ -15,7 +15,7 @@ # Andy Wardley <abw@kfs.org> # #------------------------------------------------------------------------ -# $Id: TODO.html,v 1.47 2002/07/07 17:25:55 abw Exp $ +# $Id: TODO.html,v 1.48 2002/07/09 14:42:34 abw Exp $ #======================================================================== #------------------------------------------------------------------------ From cvs@template-toolkit.org Tue Jul 09 15:42:38 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCM-000DUd-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:38 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:38 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Tutorial Datafile.html Web.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:38 Modified: docs/src/Tutorial Datafile.html Web.html Log: prep for 2.07c Revision Changes Path 1.29 +1 -1 Template2/docs/src/Tutorial/Datafile.html Index: Datafile.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Tutorial/Datafile.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Datafile.html 2002/07/07 14:43:06 1.28 +++ Datafile.html 2002/07/09 14:42:37 1.29 @@ -440,7 +440,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section 1.29 +2 -2 Template2/docs/src/Tutorial/Web.html Index: Web.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Tutorial/Web.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Web.html 2002/07/07 14:43:06 1.28 +++ Web.html 2002/07/09 14:42:38 1.29 @@ -774,7 +774,7 @@ [% WRAPPER section title="AUTHOR" -%]

    -Andy Wardley <abw@kfs.org> +Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%] @@ -783,7 +783,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Tue Jul 09 15:42:39 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCN-000DUp-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:39 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:39 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/lib/option output Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:39 Modified: docsrc/lib/option output Log: prep for 2.07c Revision Changes Path 1.3 +1 -1 Template2/docsrc/lib/option/output Index: output =================================================================== RCS file: /template-toolkit/Template2/docsrc/lib/option/output,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- output 2002/07/08 16:24:26 1.2 +++ output 2002/07/09 14:42:38 1.3 @@ -12,7 +12,7 @@ (e.g. GLOB or IO::Handle) opened for writing; a reference to a text string to which the output is appended (the string isn't cleared); a reference to a subroutine which is called, passing the output text as -an argument; as a refernce to an array, onto which the content will be +an argument; as a reference to an array, onto which the content will be push()ed; or as a reference to any object that supports the print() method. This latter option includes the Apache::Request object which is passed as the argument to Apache/mod_perl handlers. From cvs@template-toolkit.org Tue Jul 09 15:42:40 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCO-000DV1-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:40 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:40 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/pod Template.pod Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:40 Modified: docsrc/pod Template.pod Log: prep for 2.07c Revision Changes Path 1.19 +2 -2 Template2/docsrc/pod/Template.pod Index: Template.pod =================================================================== RCS file: /template-toolkit/Template2/docsrc/pod/Template.pod,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Template.pod 2002/07/07 14:43:06 1.18 +++ Template.pod 2002/07/09 14:42:39 1.19 @@ -696,7 +696,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -705,7 +705,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:42:42 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCP-000DVD-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:41 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:41 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/src/Release Changes.tt2 Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:41 Modified: docsrc/src/Release Changes.tt2 Log: prep for 2.07c Revision Changes Path 1.57 +5 -3 Template2/docsrc/src/Release/Changes.tt2 Index: Changes.tt2 =================================================================== RCS file: /template-toolkit/Template2/docsrc/src/Release/Changes.tt2,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- Changes.tt2 2002/07/09 11:18:27 1.56 +++ Changes.tt2 2002/07/09 14:42:41 1.57 @@ -20,11 +20,11 @@ # Any changes you make here may be lost! # #------------------------------------------------------------------------ -# $Id: Changes.tt2,v 1.56 2002/07/09 11:18:27 abw Exp $ +# $Id: Changes.tt2,v 1.57 2002/07/09 14:42:41 abw Exp $ #======================================================================== #------------------------------------------------------------------------ -# Version 2.07c - July th 2002 ## DEVELOPER RELEASE ## +# Version 2.07c - July 9th 2002 ## DEVELOPER RELEASE ## #------------------------------------------------------------------------ * Fixed a bug in Date plugin introduced in last version which caused @@ -41,7 +41,9 @@ method of Template::Namespace::Constants to expect and remove it. * Added the 'unique' list virtual method to cull multiple identical - items from a list. + items from a list (darren) + +* Modified the OUTPUT option to accept a reference to a list (darren) #------------------------------------------------------------------------ From cvs@template-toolkit.org Tue Jul 09 15:42:44 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCS-000DVQ-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:44 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:44 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib Template.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:43 Modified: lib Template.pm Log: prep for 2.07c Revision Changes Path 2.50 +2 -2 Template2/lib/Template.pm Index: Template.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template.pm,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- Template.pm 2002/07/08 18:42:02 2.49 +++ Template.pm 2002/07/09 14:42:42 2.50 @@ -17,7 +17,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Template.pm,v 2.49 2002/07/08 18:42:02 abw Exp $ +# $Id: Template.pm,v 2.50 2002/07/09 14:42:42 abw Exp $ # #======================================================================== @@ -902,7 +902,7 @@ =head1 VERSION -Template Toolkit version 2.07c, released on 08 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:42:50 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCY-000DWV-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:50 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:50 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Base.pm Config.pm Constants.pm Context.pm Document.pm Exception.pm FAQ.pod Filters.pm Iterator.pm Manual.pod Modules.pod Parser.pm Plugin.pm Plugins.pm Provider.pm Service.pm Stash.pm Test.pm Tutorial.pod Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:50 Modified: lib/Template Base.pm Config.pm Constants.pm Context.pm Document.pm Exception.pm FAQ.pod Filters.pm Iterator.pm Manual.pod Modules.pod Parser.pm Plugin.pm Plugins.pm Provider.pm Service.pm Stash.pm Test.pm Tutorial.pod Log: prep for 2.07c Revision Changes Path 2.53 +5 -5 Template2/lib/Template/Base.pm Index: Base.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Base.pm,v retrieving revision 2.52 retrieving revision 2.53 diff -u -r2.52 -r2.53 --- Base.pm 2002/07/07 17:25:59 2.52 +++ Base.pm 2002/07/09 14:42:44 2.53 @@ -18,7 +18,7 @@ # #------------------------------------------------------------------------ # -# $Id: Base.pm,v 2.52 2002/07/07 17:25:59 abw Exp $ +# $Id: Base.pm,v 2.53 2002/07/09 14:42:44 abw Exp $ # #======================================================================== @@ -29,7 +29,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.52 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ @@ -206,7 +206,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -215,8 +215,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.53 +5 -5 Template2/lib/Template/Config.pm Index: Config.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Config.pm,v retrieving revision 2.52 retrieving revision 2.53 diff -u -r2.52 -r2.53 --- Config.pm 2002/07/07 17:26:00 2.52 +++ Config.pm 2002/07/09 14:42:45 2.53 @@ -17,7 +17,7 @@ # #------------------------------------------------------------------------ # -# $Id: Config.pm,v 2.52 2002/07/07 17:26:00 abw Exp $ +# $Id: Config.pm,v 2.53 2002/07/09 14:42:45 abw Exp $ # #======================================================================== @@ -32,7 +32,7 @@ $LATEX_PATH $PDFLATEX_PATH $DVIPS_PATH $STASH $SERVICE $CONTEXT $CONSTANTS ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.52 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; $ERROR = ''; $CONTEXT = 'Template::Context'; @@ -405,7 +405,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -414,8 +414,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.52 +5 -5 Template2/lib/Template/Constants.pm Index: Constants.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Constants.pm,v retrieving revision 2.51 retrieving revision 2.52 diff -u -r2.51 -r2.52 --- Constants.pm 2002/07/07 17:26:00 2.51 +++ Constants.pm 2002/07/09 14:42:45 2.52 @@ -17,7 +17,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Constants.pm,v 2.51 2002/07/07 17:26:00 abw Exp $ +# $Id: Constants.pm,v 2.52 2002/07/09 14:42:45 abw Exp $ # #============================================================================ @@ -30,7 +30,7 @@ use vars qw( $VERSION @ISA @EXPORT_OK %EXPORT_TAGS ); @ISA = qw( Exporter ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.52 $ =~ /(\d+)\.(\d+)/); #======================================================================== @@ -153,7 +153,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -162,8 +162,8 @@ =head1 VERSION -2.50, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.64 +5 -5 Template2/lib/Template/Context.pm Index: Context.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Context.pm,v retrieving revision 2.63 retrieving revision 2.64 diff -u -r2.63 -r2.64 --- Context.pm 2002/07/07 17:26:01 2.63 +++ Context.pm 2002/07/09 14:42:45 2.64 @@ -18,7 +18,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Context.pm,v 2.63 2002/07/07 17:26:01 abw Exp $ +# $Id: Context.pm,v 2.64 2002/07/09 14:42:45 abw Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template::Constants; use Template::Exception; -$VERSION = sprintf("%d.%02d", q$Revision: 2.63 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.64 $ =~ /(\d+)\.(\d+)/); $DEBUG_FORMAT = "\n## \$file line \$line : [% \$text %] ##\n"; @@ -1430,7 +1430,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -1439,8 +1439,8 @@ =head1 VERSION -2.62, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.63, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.54 +5 -5 Template2/lib/Template/Document.pm Index: Document.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Document.pm,v retrieving revision 2.53 retrieving revision 2.54 diff -u -r2.53 -r2.54 --- Document.pm 2002/07/07 17:26:01 2.53 +++ Document.pm 2002/07/09 14:42:46 2.54 @@ -20,7 +20,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Document.pm,v 2.53 2002/07/07 17:26:01 abw Exp $ +# $Id: Document.pm,v 2.54 2002/07/09 14:42:46 abw Exp $ # #============================================================================ @@ -36,7 +36,7 @@ use File::Temp qw( tempfile ); use File::Basename; -$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.54 $ =~ /(\d+)\.(\d+)/); #======================================================================== @@ -457,7 +457,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -466,8 +466,8 @@ =head1 VERSION -2.52, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.49 +5 -5 Template2/lib/Template/Exception.pm Index: Exception.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Exception.pm,v retrieving revision 2.48 retrieving revision 2.49 diff -u -r2.48 -r2.49 --- Exception.pm 2002/07/07 17:26:05 2.48 +++ Exception.pm 2002/07/09 14:42:46 2.49 @@ -18,7 +18,7 @@ # #------------------------------------------------------------------------ # -# $Id: Exception.pm,v 2.48 2002/07/07 17:26:05 abw Exp $ +# $Id: Exception.pm,v 2.49 2002/07/09 14:42:46 abw Exp $ # #======================================================================== @@ -36,7 +36,7 @@ use overload q|""| => "as_string"; -$VERSION = sprintf("%d.%02d", q$Revision: 2.48 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ @@ -219,7 +219,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -228,8 +228,8 @@ =head1 VERSION -2.47, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.48, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.50 +5 -5 Template2/lib/Template/FAQ.pod Index: FAQ.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/FAQ.pod,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- FAQ.pod 2002/07/07 17:26:06 2.49 +++ FAQ.pod 2002/07/09 14:42:46 2.50 @@ -8,7 +8,7 @@ # the FAQ will soon be. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -18,7 +18,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# 2.51 +# 2.52 # #======================================================================== @@ -285,7 +285,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -294,8 +294,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.57 +5 -5 Template2/lib/Template/Filters.pm Index: Filters.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Filters.pm,v retrieving revision 2.56 retrieving revision 2.57 diff -u -r2.56 -r2.57 --- Filters.pm 2002/07/07 17:26:06 2.56 +++ Filters.pm 2002/07/09 14:42:46 2.57 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Filters.pm,v 2.56 2002/07/07 17:26:06 abw Exp $ +# $Id: Filters.pm,v 2.57 2002/07/09 14:42:46 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use vars qw( $VERSION $DEBUG $FILTERS $URI_ESCAPES $PLUGIN_FILTER ); use Template::Constants; -$VERSION = sprintf("%d.%02d", q$Revision: 2.56 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.57 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ @@ -1331,7 +1331,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -1340,8 +1340,8 @@ =head1 VERSION -2.55, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.56, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.51 +5 -5 Template2/lib/Template/Iterator.pm Index: Iterator.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Iterator.pm,v retrieving revision 2.50 retrieving revision 2.51 diff -u -r2.50 -r2.51 --- Iterator.pm 2002/07/07 17:26:07 2.50 +++ Iterator.pm 2002/07/09 14:42:46 2.51 @@ -40,7 +40,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Iterator.pm,v 2.50 2002/07/07 17:26:07 abw Exp $ +# $Id: Iterator.pm,v 2.51 2002/07/09 14:42:46 abw Exp $ # #============================================================================ @@ -54,7 +54,7 @@ use Template::Constants; use Template::Exception; -$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; @@ -421,7 +421,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -430,8 +430,8 @@ =head1 VERSION -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.35 +3 -3 Template2/lib/Template/Manual.pod Index: Manual.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual.pod,v retrieving revision 2.34 retrieving revision 2.35 diff -u -r2.34 -r2.35 --- Manual.pod 2002/07/07 14:43:08 2.34 +++ Manual.pod 2002/07/09 14:42:47 2.35 @@ -7,7 +7,7 @@ # Template Toolkit. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -139,7 +139,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -148,7 +148,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.36 +3 -3 Template2/lib/Template/Modules.pod Index: Modules.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Modules.pod,v retrieving revision 2.35 retrieving revision 2.36 diff -u -r2.35 -r2.36 --- Modules.pod 2002/07/07 14:43:08 2.35 +++ Modules.pod 2002/07/09 14:42:47 2.36 @@ -7,7 +7,7 @@ # comprise the Template Toolkit. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -398,7 +398,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -407,7 +407,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.64 +5 -5 Template2/lib/Template/Parser.pm Index: Parser.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Parser.pm,v retrieving revision 2.63 retrieving revision 2.64 diff -u -r2.63 -r2.64 --- Parser.pm 2002/07/07 17:26:07 2.63 +++ Parser.pm 2002/07/09 14:42:47 2.64 @@ -31,7 +31,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Parser.pm,v 2.63 2002/07/07 17:26:07 abw Exp $ +# $Id: Parser.pm,v 2.64 2002/07/09 14:42:47 abw Exp $ # #============================================================================ @@ -54,7 +54,7 @@ use constant ERROR => 2; use constant ABORT => 3; -$VERSION = sprintf("%d.%02d", q$Revision: 2.63 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.64 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; $ERROR = ''; @@ -1327,7 +1327,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -1338,8 +1338,8 @@ =head1 VERSION -2.62, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.63, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. 2.52 +5 -5 Template2/lib/Template/Plugin.pm Index: Plugin.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin.pm,v retrieving revision 2.51 retrieving revision 2.52 diff -u -r2.51 -r2.52 --- Plugin.pm 2002/07/07 17:26:08 2.51 +++ Plugin.pm 2002/07/09 14:42:47 2.52 @@ -19,7 +19,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Plugin.pm,v 2.51 2002/07/07 17:26:08 abw Exp $ +# $Id: Plugin.pm,v 2.52 2002/07/09 14:42:47 abw Exp $ # #============================================================================ @@ -33,7 +33,7 @@ use vars qw( $VERSION $DEBUG $ERROR $AUTOLOAD ); use base qw( Template::Base ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.52 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0; @@ -374,7 +374,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -383,8 +383,8 @@ =head1 VERSION -2.50, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.56 +5 -5 Template2/lib/Template/Plugins.pm Index: Plugins.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugins.pm,v retrieving revision 2.55 retrieving revision 2.56 diff -u -r2.55 -r2.56 --- Plugins.pm 2002/07/07 17:26:08 2.55 +++ Plugins.pm 2002/07/09 14:42:47 2.56 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Plugins.pm,v 2.55 2002/07/07 17:26:08 abw Exp $ +# $Id: Plugins.pm,v 2.56 2002/07/09 14:42:47 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use vars qw( $VERSION $DEBUG $STD_PLUGINS ); use Template::Constants; -$VERSION = sprintf("%d.%02d", q$Revision: 2.55 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.56 $ =~ /(\d+)\.(\d+)/); $STD_PLUGINS = { 'autoformat' => 'Template::Plugin::Autoformat', @@ -985,7 +985,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -994,8 +994,8 @@ =head1 VERSION -2.54, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.55, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.59 +19 -5 Template2/lib/Template/Provider.pm Index: Provider.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Provider.pm,v retrieving revision 2.58 retrieving revision 2.59 diff -u -r2.58 -r2.59 --- Provider.pm 2002/07/08 16:50:43 2.58 +++ Provider.pm 2002/07/09 14:42:47 2.59 @@ -27,7 +27,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Provider.pm,v 2.58 2002/07/08 16:50:43 abw Exp $ +# $Id: Provider.pm,v 2.59 2002/07/09 14:42:47 abw Exp $ # #============================================================================ @@ -44,7 +44,7 @@ use File::Basename; use File::Spec; -$VERSION = sprintf("%d.%02d", q$Revision: 2.58 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.59 $ =~ /(\d+)\.(\d+)/); # name of document class $DOCUMENT = 'Template::Document' unless defined $DOCUMENT; @@ -1365,6 +1365,20 @@ argument, this method will replace the existing INCLUDE_PATH with the new value. +=head2 paths() + +This method generates a copy of the INCLUDE_PATH list. Any elements in the +list which are dynamic generators (e.g. references to subroutines or objects +implementing a paths() method) will be called and the list of directories +returned merged into the output list. + +It is possible to provide a generator which returns itself, thus sending +this method into an infinite loop. To detect and prevent this from happening, +the C<$MAX_DIRS> package variable, set to 64 by default, limits the maximum +number of paths that can be added to, or generated for the output list. If +this number is exceeded then the method will immediately return an error +reporting as much. + =head1 AUTHOR Andy Wardley Eabw@andywardley.comE @@ -1376,8 +1390,8 @@ =head1 VERSION -2.57, distributed as part of the -Template Toolkit version 2.07c, released on 08 July 2002. +2.58, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT @@ -1389,4 +1403,4 @@ =head1 SEE ALSO -L, L, L +L, L, L \ No newline at end of file 2.57 +5 -5 Template2/lib/Template/Service.pm Index: Service.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Service.pm,v retrieving revision 2.56 retrieving revision 2.57 diff -u -r2.56 -r2.57 --- Service.pm 2002/07/07 17:26:09 2.56 +++ Service.pm 2002/07/09 14:42:48 2.57 @@ -19,7 +19,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Service.pm,v 2.56 2002/07/07 17:26:09 abw Exp $ +# $Id: Service.pm,v 2.57 2002/07/09 14:42:48 abw Exp $ # #============================================================================ @@ -34,7 +34,7 @@ use Template::Config; use Template::Exception; -$VERSION = sprintf("%d.%02d", q$Revision: 2.56 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.57 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; @@ -701,7 +701,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -710,8 +710,8 @@ =head1 VERSION -2.55, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.58, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.64 +5 -5 Template2/lib/Template/Stash.pm Index: Stash.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Stash.pm,v retrieving revision 2.63 retrieving revision 2.64 diff -u -r2.63 -r2.64 --- Stash.pm 2002/07/08 17:06:53 2.63 +++ Stash.pm 2002/07/09 14:42:48 2.64 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Stash.pm,v 2.63 2002/07/08 17:06:53 abw Exp $ +# $Id: Stash.pm,v 2.64 2002/07/09 14:42:48 abw Exp $ # #============================================================================ @@ -29,7 +29,7 @@ use strict; use vars qw( $VERSION $DEBUG $ROOT_OPS $SCALAR_OPS $HASH_OPS $LIST_OPS ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.63 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.64 $ =~ /(\d+)\.(\d+)/); #======================================================================== @@ -878,8 +878,8 @@ =head1 VERSION -2.61, distributed as part of the -Template Toolkit version 2.07c, released on 08 July 2002. +2.63, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT @@ -891,4 +891,4 @@ =head1 SEE ALSO -L, L +L, L \ No newline at end of file 2.53 +5 -5 Template2/lib/Template/Test.pm Index: Test.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Test.pm,v retrieving revision 2.52 retrieving revision 2.53 diff -u -r2.52 -r2.53 --- Test.pm 2002/07/07 17:26:11 2.52 +++ Test.pm 2002/07/09 14:42:48 2.53 @@ -20,7 +20,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Test.pm,v 2.52 2002/07/07 17:26:11 abw Exp $ +# $Id: Test.pm,v 2.53 2002/07/09 14:42:48 abw Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template qw( :template ); use Exporter; -$VERSION = sprintf("%d.%02d", q$Revision: 2.52 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0; @ISA = qw( Exporter ); @EXPORT = qw( ntests ok is match flush test_expect callsign banner ); @@ -648,7 +648,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -657,8 +657,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.36 +3 -3 Template2/lib/Template/Tutorial.pod Index: Tutorial.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Tutorial.pod,v retrieving revision 2.35 retrieving revision 2.36 diff -u -r2.35 -r2.36 --- Tutorial.pod 2002/07/07 14:43:10 2.35 +++ Tutorial.pod 2002/07/09 14:42:48 2.36 @@ -10,7 +10,7 @@ # particular reference to XML. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -77,7 +77,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -86,7 +86,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:42:53 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCb-000DWn-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:53 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:53 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Library HTML.pod PostScript.pod Splash.pod Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:53 Modified: lib/Template/Library HTML.pod PostScript.pod Splash.pod Log: prep for 2.07c Revision Changes Path 1.49 +5 -5 Template2/lib/Template/Library/HTML.pod Index: HTML.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Library/HTML.pod,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- HTML.pod 2002/07/07 17:26:12 1.48 +++ HTML.pod 2002/07/09 14:42:50 1.49 @@ -7,7 +7,7 @@ # building HTML pages. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -17,7 +17,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# 2.51 +# 2.52 # #======================================================================== @@ -281,7 +281,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -290,8 +290,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.49 +5 -5 Template2/lib/Template/Library/PostScript.pod Index: PostScript.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Library/PostScript.pod,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- PostScript.pod 2002/07/07 17:26:15 1.48 +++ PostScript.pod 2002/07/09 14:42:51 1.49 @@ -7,7 +7,7 @@ # PostScript pages. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -17,7 +17,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# 2.51 +# 2.52 # #======================================================================== @@ -45,7 +45,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -54,8 +54,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.49 +5 -5 Template2/lib/Template/Library/Splash.pod Index: Splash.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Library/Splash.pod,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- Splash.pod 2002/07/07 17:26:16 1.48 +++ Splash.pod 2002/07/09 14:42:53 1.49 @@ -8,7 +8,7 @@ # pages # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -18,7 +18,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# 2.51 +# 2.52 # #======================================================================== @@ -995,7 +995,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -1004,8 +1004,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:42:57 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCf-000DXT-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:57 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:57 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Manual Config.pod Credits.pod Directives.pod Filters.pod Internals.pod Intro.pod Plugins.pod Refs.pod Syntax.pod Variables.pod Views.pod Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:57 Modified: lib/Template/Manual Config.pod Credits.pod Directives.pod Filters.pod Internals.pod Intro.pod Plugins.pod Refs.pod Syntax.pod Variables.pod Views.pod Log: prep for 2.07c Revision Changes Path 1.36 +70 -6 Template2/lib/Template/Manual/Config.pod Index: Config.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Config.pod,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Config.pod 2002/07/07 17:26:17 1.35 +++ Config.pod 2002/07/09 14:42:54 1.36 @@ -8,7 +8,7 @@ # the Template Toolkit. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -358,8 +358,64 @@ that have ':' followed by a '/' or '\'. This avoids confusion when using directory names like 'C:\Blah Blah'. +When specified as a list, the INCLUDE_PATH path can contain elements +which dynamically generate a list of INCLUDE_PATH directories. These +generator elements can be specified as a reference to a subroutine or +an object which implements a paths() method. + my $template = Template->new({ + INCLUDE_PATH => [ '/usr/local/templates', + \&incpath_generator, + My::IncPath::Generator->new( ... ) ], + }); + +Each time a template is requested and the INCLUDE_PATH examined, the +subroutine or object method will be called. A reference to a list of +directories should be returned. Generator subroutines should report +errors using die(). Generator objects should return undef and make an +error available via its error() method. + +For example: + + sub incpath_generator { + + # ...some code... + + if ($all_is_well) { + return \@list_of_directories; + } + else { + die "cannot generate INCLUDE_PATH...\n"; + } + } + +or: + package My::IncPath::Generator; + + # Template::Base (or Class::Base) provides error() method + use Template::Base; + use base qw( Template::Base ); + + sub paths { + my $self = shift; + + # ...some code... + + if ($all_is_well) { + return \@list_of_directories; + } + else { + return $self->error("cannot generate INCLUDE_PATH...\n"); + } + } + + 1; + + + + + =item DELIMITER Used to provide an alternative delimiter character sequence for @@ -952,7 +1008,8 @@ (e.g. GLOB or IO::Handle) opened for writing; a reference to a text string to which the output is appended (the string isn't cleared); a reference to a subroutine which is called, passing the output text as -an argument; or as a reference to any object that supports the print() +an argument; as a reference to an array, onto which the content will be +push()ed; or as a reference to any object that supports the print() method. This latter option includes the Apache::Request object which is passed as the argument to Apache/mod_perl handlers. @@ -985,9 +1042,15 @@ my $template = Template->new({ OUTPUT => \&output, }); + +example 5 (array reference): -example 5 (Apache/mod_perl handler): + my $template = Template->new({ + OUTPUT => \@output, + }) +example 6 (Apache/mod_perl handler): + sub handler { my $r = shift; @@ -1004,6 +1067,7 @@ $t->process($file, $vars, "/tmp/foo"); $t->process($file, $vars, "bar"); $t->process($file, $vars, \*MYGLOB); + $t->process($file, $vars, \@output); $t->process($file, $vars, $r); # Apache::Request ... @@ -1087,7 +1151,7 @@ ## input text line 1 : [% foo = 'World' %] ## Hello World - + It is anticipated that a future version of the Template Toolkit will support allow the different debugging options to be enabled or disabled individually. @@ -1810,7 +1874,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -1819,7 +1883,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.37 +3 -3 Template2/lib/Template/Manual/Credits.pod Index: Credits.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Credits.pod,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Credits.pod 2002/07/07 14:43:11 1.36 +++ Credits.pod 2002/07/09 14:42:54 1.37 @@ -8,7 +8,7 @@ # contributed to it. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -145,7 +145,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -154,7 +154,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.36 +3 -3 Template2/lib/Template/Manual/Directives.pod Index: Directives.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Directives.pod,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Directives.pod 2002/07/07 17:26:17 1.35 +++ Directives.pod 2002/07/09 14:42:54 1.36 @@ -7,7 +7,7 @@ # directives, complete with examples of use. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -2113,7 +2113,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -2122,7 +2122,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.35 +3 -3 Template2/lib/Template/Manual/Filters.pod Index: Filters.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Filters.pod,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Filters.pod 2002/07/07 14:43:11 1.34 +++ Filters.pod 2002/07/09 14:42:54 1.35 @@ -7,7 +7,7 @@ # Template Toolkit for post-processing output. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -458,7 +458,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -467,7 +467,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.35 +3 -3 Template2/lib/Template/Manual/Internals.pod Index: Internals.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Internals.pod,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Internals.pod 2002/07/07 14:43:11 1.34 +++ Internals.pod 2002/07/09 14:42:55 1.35 @@ -11,7 +11,7 @@ # find out how it all works. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -524,7 +524,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -533,7 +533,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.35 +3 -3 Template2/lib/Template/Manual/Intro.pod Index: Intro.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Intro.pod,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Intro.pod 2002/07/07 14:43:12 1.34 +++ Intro.pod 2002/07/09 14:42:55 1.35 @@ -10,7 +10,7 @@ # presentation elements from application logic and data. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -263,7 +263,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -272,7 +272,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.35 +3 -3 Template2/lib/Template/Manual/Plugins.pod Index: Plugins.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Plugins.pod,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Plugins.pod 2002/07/07 14:43:12 1.34 +++ Plugins.pod 2002/07/09 14:42:55 1.35 @@ -9,7 +9,7 @@ # modules from CPAN. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -520,7 +520,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -529,7 +529,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.35 +18 -3 Template2/lib/Template/Manual/Refs.pod Index: Refs.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Refs.pod,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Refs.pod 2002/07/07 14:43:12 1.34 +++ Refs.pod 2002/07/09 14:42:55 1.35 @@ -7,7 +7,7 @@ # other resources related to the Template Toolkit. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -120,11 +120,26 @@ http://slashcode.org/ +=item OpenFrame + +OpenFrame is an open source application framework for distributed +media applications. It ships with a generator for the Template +Toolkit. + + http://openframe.fotango.com/ + +=item PCMT + +PCMT is the Personal Content Management Toolkit. It uses the Template +Toolkit as the presentation engine. + + http://pcmt.sf.net/ + =back =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -133,7 +148,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.35 +3 -3 Template2/lib/Template/Manual/Syntax.pod Index: Syntax.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Syntax.pod,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Syntax.pod 2002/07/07 14:43:12 1.34 +++ Syntax.pod 2002/07/09 14:42:55 1.35 @@ -7,7 +7,7 @@ # Template Toolkit directives and general presentation language. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -274,7 +274,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -283,7 +283,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.35 +17 -3 Template2/lib/Template/Manual/Variables.pod Index: Variables.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Variables.pod,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Variables.pod 2002/07/07 14:43:12 1.34 +++ Variables.pod 2002/07/09 14:42:55 1.35 @@ -8,7 +8,7 @@ # directives. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -742,6 +742,20 @@ [% first = mylist.shift %] [% last = mylist.pop %] +=item unique + +Returns a list of the unique elements in a list, in the same order +as in the list itself. + + [% mylist = [ 1, 2, 3, 2, 3, 4, 1, 4, 3, 4, 5 ] %] + [% numbers = mylist.unique %] + +While this can be explicitly sorted, it is not required that the list +be sorted before the unique elements pulled out (unlike the Unix +command line utility). + + [% numbers = mylist.unique.sort %] + =back The following example demonstrates how an empty list ('folk') can be @@ -1170,7 +1184,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -1179,7 +1193,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.35 +3 -3 Template2/lib/Template/Manual/Views.pod Index: Views.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Manual/Views.pod,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Views.pod 2002/07/07 14:43:12 1.34 +++ Views.pod 2002/07/09 14:42:56 1.35 @@ -7,7 +7,7 @@ # new feature in version 2.01 of the Template Toolkit. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -610,7 +610,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -619,7 +619,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:42:58 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCg-000DXf-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:42:58 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:42:58 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Namespace Constants.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:42:58 Modified: lib/Template/Namespace Constants.pm Log: prep for 2.07c Revision Changes Path 1.7 +6 -6 Template2/lib/Template/Namespace/Constants.pm Index: Constants.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Namespace/Constants.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Constants.pm 2002/07/08 16:09:48 1.6 +++ Constants.pm 2002/07/09 14:42:57 1.7 @@ -17,7 +17,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Constants.pm,v 1.6 2002/07/08 16:09:48 abw Exp $ +# $Id: Constants.pm,v 1.7 2002/07/09 14:42:57 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use base qw( Template::Base ); use vars qw( $VERSION $DEBUG ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.7 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; @@ -157,7 +157,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -166,8 +166,8 @@ =head1 VERSION -1.03, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.06, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT @@ -179,4 +179,4 @@ =head1 SEE ALSO -L +L \ No newline at end of file From cvs@template-toolkit.org Tue Jul 09 15:43:12 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCt-000DYu-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:43:11 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:43:11 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Plugin Autoformat.pm CGI.pm DBI.pm Datafile.pm Date.pm Directory.pm Dumper.pm File.pm Filter.pm Format.pm HTML.pm Iterator.pm Pod.pm String.pm Table.pm URL.pm View.pm Wrap.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:43:11 Modified: lib/Template/Plugin Autoformat.pm CGI.pm DBI.pm Datafile.pm Date.pm Directory.pm Dumper.pm File.pm Filter.pm Format.pm HTML.pm Iterator.pm Pod.pm String.pm Table.pm URL.pm View.pm Wrap.pm Log: prep for 2.07c Revision Changes Path 2.51 +4 -4 Template2/lib/Template/Plugin/Autoformat.pm Index: Autoformat.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Autoformat.pm,v retrieving revision 2.50 retrieving revision 2.51 diff -u -r2.50 -r2.51 --- Autoformat.pm 2002/07/07 17:26:19 2.50 +++ Autoformat.pm 2002/07/09 14:42:58 2.51 @@ -21,7 +21,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Autoformat.pm,v 2.50 2002/07/07 17:26:19 abw Exp $ +# $Id: Autoformat.pm,v 2.51 2002/07/09 14:42:58 abw Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template::Plugin; use Text::Autoformat; -$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); sub new { my ($class, $context, $options) = @_; @@ -224,8 +224,8 @@ =head1 VERSION -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. 2.50 +5 -5 Template2/lib/Template/Plugin/CGI.pm Index: CGI.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/CGI.pm,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- CGI.pm 2002/07/07 17:26:20 2.49 +++ CGI.pm 2002/07/09 14:42:59 2.50 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: CGI.pm,v 2.49 2002/07/07 17:26:20 abw Exp $ +# $Id: CGI.pm,v 2.50 2002/07/09 14:42:59 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use Template::Plugin; use CGI; -$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); sub new { my $class = shift; @@ -98,7 +98,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -107,8 +107,8 @@ =head1 VERSION -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.47 +4 -4 Template2/lib/Template/Plugin/DBI.pm Index: DBI.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/DBI.pm,v retrieving revision 2.46 retrieving revision 2.47 diff -u -r2.46 -r2.47 --- DBI.pm 2002/07/07 17:26:21 2.46 +++ DBI.pm 2002/07/09 14:42:59 2.47 @@ -19,7 +19,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: DBI.pm,v 2.46 2002/07/07 17:26:21 abw Exp $ +# $Id: DBI.pm,v 2.47 2002/07/09 14:42:59 abw Exp $ # #============================================================================== @@ -35,7 +35,7 @@ use vars qw( $VERSION $DEBUG $QUERY $ITERATOR ); use base qw( Template::Plugin ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.46 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.47 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; $QUERY = 'Template::Plugin::DBI::Query'; $ITERATOR = 'Template::Plugin::DBI::Iterator'; @@ -930,8 +930,8 @@ =head1 VERSION -2.45, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.46, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. 2.53 +5 -5 Template2/lib/Template/Plugin/Datafile.pm Index: Datafile.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Datafile.pm,v retrieving revision 2.52 retrieving revision 2.53 diff -u -r2.52 -r2.53 --- Datafile.pm 2002/07/07 17:26:21 2.52 +++ Datafile.pm 2002/07/09 14:42:59 2.53 @@ -19,7 +19,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Datafile.pm,v 2.52 2002/07/07 17:26:21 abw Exp $ +# $Id: Datafile.pm,v 2.53 2002/07/09 14:42:59 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( Template::Plugin ); use Template::Plugin; -$VERSION = sprintf("%d.%02d", q$Revision: 2.52 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); sub new { my ($class, $context, $filename, $params) = @_; @@ -163,7 +163,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -172,8 +172,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.54 +4 -4 Template2/lib/Template/Plugin/Date.pm Index: Date.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Date.pm,v retrieving revision 2.53 retrieving revision 2.54 diff -u -r2.53 -r2.54 --- Date.pm 2002/07/08 11:03:46 2.53 +++ Date.pm 2002/07/09 14:42:59 2.54 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Date.pm,v 2.53 2002/07/08 11:03:46 abw Exp $ +# $Id: Date.pm,v 2.54 2002/07/09 14:42:59 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use POSIX (); -$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.54 $ =~ /(\d+)\.(\d+)/); $FORMAT = '%H:%M:%S %d-%b-%Y'; # default strftime() format @@ -301,8 +301,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. 2.50 +4 -4 Template2/lib/Template/Plugin/Directory.pm Index: Directory.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Directory.pm,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- Directory.pm 2002/07/07 17:26:23 2.49 +++ Directory.pm 2002/07/09 14:42:59 2.50 @@ -14,7 +14,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Directory.pm,v 2.49 2002/07/07 17:26:23 abw Exp $ +# $Id: Directory.pm,v 2.50 2002/07/09 14:42:59 abw Exp $ # #============================================================================ @@ -29,7 +29,7 @@ use vars qw( $VERSION ); use base qw( Template::Plugin::File ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ @@ -394,8 +394,8 @@ =head1 VERSION -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. 2.50 +4 -4 Template2/lib/Template/Plugin/Dumper.pm Index: Dumper.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Dumper.pm,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- Dumper.pm 2002/07/07 17:26:23 2.49 +++ Dumper.pm 2002/07/09 14:42:59 2.50 @@ -18,7 +18,7 @@ # #------------------------------------------------------------------------------ # -# $Id: Dumper.pm,v 2.49 2002/07/07 17:26:23 abw Exp $ +# $Id: Dumper.pm,v 2.50 2002/07/09 14:42:59 abw Exp $ # #============================================================================== @@ -33,7 +33,7 @@ use vars qw( $VERSION $DEBUG $AUTOLOAD ); use base qw( Template::Plugin ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; #============================================================================== @@ -159,8 +159,8 @@ =head1 VERSION -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. 2.50 +4 -4 Template2/lib/Template/Plugin/File.pm Index: File.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/File.pm,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- File.pm 2002/07/07 17:26:24 2.49 +++ File.pm 2002/07/09 14:43:00 2.50 @@ -16,7 +16,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: File.pm,v 2.49 2002/07/07 17:26:24 abw Exp $ +# $Id: File.pm,v 2.50 2002/07/09 14:43:00 abw Exp $ # #============================================================================ @@ -34,7 +34,7 @@ use base qw( Template::Plugin ); use vars qw( @STAT_KEYS ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); @STAT_KEYS = qw( dev ino mode nlink uid gid rdev size atime mtime ctime blksize blocks ); @@ -400,8 +400,8 @@ =head1 VERSION -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. 1.17 +5 -5 Template2/lib/Template/Plugin/Filter.pm Index: Filter.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Filter.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Filter.pm 2002/07/07 17:26:25 1.16 +++ Filter.pm 2002/07/09 14:43:01 1.17 @@ -17,7 +17,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Filter.pm,v 1.16 2002/07/07 17:26:25 abw Exp $ +# $Id: Filter.pm,v 1.17 2002/07/09 14:43:01 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use base qw( Template::Plugin ); use vars qw( $VERSION $DYNAMIC ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.16 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.17 $ =~ /(\d+)\.(\d+)/); $DYNAMIC = 0 unless defined $DYNAMIC; @@ -400,7 +400,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -409,8 +409,8 @@ =head1 VERSION -1.15, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.16, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.51 +5 -5 Template2/lib/Template/Plugin/Format.pm Index: Format.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Format.pm,v retrieving revision 2.50 retrieving revision 2.51 diff -u -r2.50 -r2.51 --- Format.pm 2002/07/07 17:26:25 2.50 +++ Format.pm 2002/07/09 14:43:01 2.51 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Format.pm,v 2.50 2002/07/07 17:26:25 abw Exp $ +# $Id: Format.pm,v 2.51 2002/07/09 14:43:01 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use base qw( Template::Plugin ); use Template::Plugin; -$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); sub new { @@ -89,7 +89,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -98,8 +98,8 @@ =head1 VERSION -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.43 +5 -5 Template2/lib/Template/Plugin/HTML.pm Index: HTML.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/HTML.pm,v retrieving revision 2.42 retrieving revision 2.43 diff -u -r2.42 -r2.43 --- HTML.pm 2002/07/07 17:26:26 2.42 +++ HTML.pm 2002/07/09 14:43:01 2.43 @@ -19,7 +19,7 @@ # #---------------------------------------------------------------------------- # -# $Id: HTML.pm,v 2.42 2002/07/07 17:26:26 abw Exp $ +# $Id: HTML.pm,v 2.43 2002/07/09 14:43:01 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( Template::Plugin ); use Template::Plugin; -$VERSION = sprintf("%d.%02d", q$Revision: 2.42 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.43 $ =~ /(\d+)\.(\d+)/); sub new { my ($class, $context, @args) = @_; @@ -162,7 +162,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -171,8 +171,8 @@ =head1 VERSION -2.41, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.42, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.49 +5 -5 Template2/lib/Template/Plugin/Iterator.pm Index: Iterator.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Iterator.pm,v retrieving revision 2.48 retrieving revision 2.49 diff -u -r2.48 -r2.49 --- Iterator.pm 2002/07/07 17:26:26 2.48 +++ Iterator.pm 2002/07/09 14:43:02 2.49 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Iterator.pm,v 2.48 2002/07/07 17:26:26 abw Exp $ +# $Id: Iterator.pm,v 2.49 2002/07/09 14:43:02 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use Template::Plugin; use Template::Iterator; -$VERSION = sprintf("%d.%02d", q$Revision: 2.48 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ # new($context, \@data, \%args) @@ -83,7 +83,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -92,8 +92,8 @@ =head1 VERSION -2.47, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.48, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.48 +5 -5 Template2/lib/Template/Plugin/Pod.pm Index: Pod.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Pod.pm,v retrieving revision 2.47 retrieving revision 2.48 diff -u -r2.47 -r2.48 --- Pod.pm 2002/07/07 17:26:27 2.47 +++ Pod.pm 2002/07/09 14:43:02 2.48 @@ -15,7 +15,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Pod.pm,v 2.47 2002/07/07 17:26:27 abw Exp $ +# $Id: Pod.pm,v 2.48 2002/07/09 14:43:02 abw Exp $ # #============================================================================ @@ -27,7 +27,7 @@ use vars qw( $VERSION ); use base qw( Template::Plugin ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.47 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.48 $ =~ /(\d+)\.(\d+)/); use Pod::POM; @@ -80,7 +80,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -89,8 +89,8 @@ =head1 VERSION -2.46, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.47, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.19 +5 -5 Template2/lib/Template/Plugin/String.pm Index: String.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/String.pm,v retrieving revision 2.18 retrieving revision 2.19 diff -u -r2.18 -r2.19 --- String.pm 2002/07/07 17:26:28 2.18 +++ String.pm 2002/07/09 14:43:02 2.19 @@ -15,7 +15,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: String.pm,v 2.18 2002/07/07 17:26:28 abw Exp $ +# $Id: String.pm,v 2.19 2002/07/09 14:43:02 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use overload q|""| => "text", fallback => 1; -$VERSION = sprintf("%d.%02d", q$Revision: 2.18 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.19 $ =~ /(\d+)\.(\d+)/); $ERROR = ''; *centre = \*center; @@ -761,7 +761,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -770,8 +770,8 @@ =head1 VERSION -2.17, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.18, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.51 +5 -5 Template2/lib/Template/Plugin/Table.pm Index: Table.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Table.pm,v retrieving revision 2.50 retrieving revision 2.51 diff -u -r2.50 -r2.51 --- Table.pm 2002/07/07 17:26:28 2.50 +++ Table.pm 2002/07/09 14:43:03 2.51 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Table.pm,v 2.50 2002/07/07 17:26:28 abw Exp $ +# $Id: Table.pm,v 2.51 2002/07/09 14:43:03 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use base qw( Template::Plugin ); use Template::Plugin; -$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ @@ -429,7 +429,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -438,8 +438,8 @@ =head1 VERSION -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.51 +5 -5 Template2/lib/Template/Plugin/URL.pm Index: URL.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/URL.pm,v retrieving revision 2.50 retrieving revision 2.51 diff -u -r2.50 -r2.51 --- URL.pm 2002/07/07 17:26:29 2.50 +++ URL.pm 2002/07/09 14:43:03 2.51 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: URL.pm,v 2.50 2002/07/07 17:26:29 abw Exp $ +# $Id: URL.pm,v 2.51 2002/07/09 14:43:03 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use Template::Plugin; @ISA = qw( Template::Plugin ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ @@ -201,7 +201,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -210,8 +210,8 @@ =head1 VERSION -2.49, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.50 +5 -5 Template2/lib/Template/Plugin/View.pm Index: View.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/View.pm,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- View.pm 2002/07/07 17:26:30 2.49 +++ View.pm 2002/07/09 14:43:04 2.50 @@ -16,7 +16,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: View.pm,v 2.49 2002/07/07 17:26:30 abw Exp $ +# $Id: View.pm,v 2.50 2002/07/09 14:43:04 abw Exp $ # #============================================================================ @@ -29,7 +29,7 @@ use vars qw( $VERSION ); use base qw( Template::Plugin ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); use Template::View; @@ -92,7 +92,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -101,8 +101,8 @@ =head1 VERSION -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.50 +4 -4 Template2/lib/Template/Plugin/Wrap.pm Index: Wrap.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/Wrap.pm,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- Wrap.pm 2002/07/07 17:26:30 2.49 +++ Wrap.pm 2002/07/09 14:43:04 2.50 @@ -16,7 +16,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Wrap.pm,v 2.49 2002/07/07 17:26:30 abw Exp $ +# $Id: Wrap.pm,v 2.50 2002/07/09 14:43:04 abw Exp $ # #============================================================================ @@ -30,7 +30,7 @@ use Template::Plugin; use Text::Wrap; -$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); sub new { my ($class, $context, $format) = @_;; @@ -145,8 +145,8 @@ =head1 VERSION -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:43:17 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwCy-000DZO-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:43:16 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:43:16 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Plugin/GD Constants.pm Image.pm Polygon.pm Text.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:43:16 Modified: lib/Template/Plugin/GD Constants.pm Image.pm Polygon.pm Text.pm Log: prep for 2.07c Revision Changes Path 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Constants.pm Index: Constants.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Constants.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Constants.pm 2002/07/07 17:26:31 1.41 +++ Constants.pm 2002/07/09 14:43:13 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Constants.pm,v 1.41 2002/07/07 17:26:31 abw Exp $ +# $Id: Constants.pm,v 1.42 2002/07/09 14:43:13 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( Template::Plugin ); use vars qw( @ISA $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -110,8 +110,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Image.pm Index: Image.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Image.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Image.pm 2002/07/07 17:26:35 1.41 +++ Image.pm 2002/07/09 14:43:13 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Image.pm,v 1.41 2002/07/07 17:26:35 abw Exp $ +# $Id: Image.pm,v 1.42 2002/07/09 14:43:13 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -156,8 +156,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Polygon.pm Index: Polygon.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Polygon.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Polygon.pm 2002/07/07 17:26:36 1.41 +++ Polygon.pm 2002/07/09 14:43:14 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Polygon.pm,v 1.41 2002/07/07 17:26:36 abw Exp $ +# $Id: Polygon.pm,v 1.42 2002/07/09 14:43:14 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -127,8 +127,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Text.pm Index: Text.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Text.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Text.pm 2002/07/07 17:26:36 1.41 +++ Text.pm 2002/07/09 14:43:14 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Text.pm,v 1.41 2002/07/07 17:26:36 abw Exp $ +# $Id: Text.pm,v 1.42 2002/07/09 14:43:14 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Text Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -112,8 +112,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:43:28 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwDA-000DaM-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:43:28 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:43:28 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Plugin/GD/Graph area.pm bars.pm bars3d.pm lines.pm lines3d.pm linespoints.pm mixed.pm pie.pm pie3d.pm points.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:43:27 Modified: lib/Template/Plugin/GD/Graph area.pm bars.pm bars3d.pm lines.pm lines3d.pm linespoints.pm mixed.pm pie.pm pie3d.pm points.pm Log: prep for 2.07c Revision Changes Path 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/area.pm Index: area.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/area.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- area.pm 2002/07/07 17:26:37 1.41 +++ area.pm 2002/07/09 14:43:17 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: area.pm,v 1.41 2002/07/07 17:26:37 abw Exp $ +# $Id: area.pm,v 1.42 2002/07/09 14:43:17 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::area Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -112,8 +112,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/bars.pm Index: bars.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/bars.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- bars.pm 2002/07/07 17:26:38 1.41 +++ bars.pm 2002/07/09 14:43:18 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: bars.pm,v 1.41 2002/07/07 17:26:38 abw Exp $ +# $Id: bars.pm,v 1.42 2002/07/09 14:43:18 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::bars Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -155,8 +155,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/bars3d.pm Index: bars3d.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/bars3d.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- bars3d.pm 2002/07/07 17:26:39 1.41 +++ bars3d.pm 2002/07/09 14:43:19 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: bars3d.pm,v 1.41 2002/07/07 17:26:39 abw Exp $ +# $Id: bars3d.pm,v 1.42 2002/07/09 14:43:19 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::bars3d Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -130,8 +130,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/lines.pm Index: lines.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/lines.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- lines.pm 2002/07/07 17:26:39 1.41 +++ lines.pm 2002/07/09 14:43:20 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: lines.pm,v 1.41 2002/07/07 17:26:39 abw Exp $ +# $Id: lines.pm,v 1.42 2002/07/09 14:43:20 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::lines Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -142,8 +142,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/lines3d.pm Index: lines3d.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/lines3d.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- lines3d.pm 2002/07/07 17:26:42 1.41 +++ lines3d.pm 2002/07/09 14:43:20 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: lines3d.pm,v 1.41 2002/07/07 17:26:42 abw Exp $ +# $Id: lines3d.pm,v 1.42 2002/07/09 14:43:20 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::lines3d Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -130,8 +130,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/linespoints.pm Index: linespoints.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/linespoints.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- linespoints.pm 2002/07/07 17:26:43 1.41 +++ linespoints.pm 2002/07/09 14:43:21 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: linespoints.pm,v 1.41 2002/07/07 17:26:43 abw Exp $ +# $Id: linespoints.pm,v 1.42 2002/07/09 14:43:21 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::linespoints Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -122,8 +122,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/mixed.pm Index: mixed.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/mixed.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- mixed.pm 2002/07/07 17:26:43 1.41 +++ mixed.pm 2002/07/09 14:43:21 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: mixed.pm,v 1.41 2002/07/07 17:26:43 abw Exp $ +# $Id: mixed.pm,v 1.42 2002/07/09 14:43:21 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::mixed Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -140,8 +140,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/pie.pm Index: pie.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/pie.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- pie.pm 2002/07/07 17:26:44 1.41 +++ pie.pm 2002/07/09 14:43:22 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: pie.pm,v 1.41 2002/07/07 17:26:44 abw Exp $ +# $Id: pie.pm,v 1.42 2002/07/09 14:43:22 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::pie Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -113,8 +113,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/pie3d.pm Index: pie3d.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/pie3d.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- pie3d.pm 2002/07/07 17:26:44 1.41 +++ pie3d.pm 2002/07/09 14:43:24 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: pie3d.pm,v 1.41 2002/07/07 17:26:44 abw Exp $ +# $Id: pie3d.pm,v 1.42 2002/07/09 14:43:24 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::pie3d Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -117,8 +117,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Graph/points.pm Index: points.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Graph/points.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- points.pm 2002/07/07 17:26:44 1.41 +++ points.pm 2002/07/09 14:43:24 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: points.pm,v 1.41 2002/07/07 17:26:44 abw Exp $ +# $Id: points.pm,v 1.42 2002/07/09 14:43:24 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Graph::points Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -119,8 +119,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:43:31 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwDD-000Daj-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:43:31 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:43:31 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Plugin/GD/Text Align.pm Wrap.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:43:31 Modified: lib/Template/Plugin/GD/Text Align.pm Wrap.pm Log: prep for 2.07c Revision Changes Path 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Text/Align.pm Index: Align.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Text/Align.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Align.pm 2002/07/07 17:26:45 1.41 +++ Align.pm 2002/07/09 14:43:29 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Align.pm,v 1.41 2002/07/07 17:26:45 abw Exp $ +# $Id: Align.pm,v 1.42 2002/07/09 14:43:29 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Text::Align Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -119,8 +119,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.42 +4 -4 Template2/lib/Template/Plugin/GD/Text/Wrap.pm Index: Wrap.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/GD/Text/Wrap.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Wrap.pm 2002/07/07 17:26:45 1.41 +++ Wrap.pm 2002/07/09 14:43:30 1.42 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Wrap.pm,v 1.41 2002/07/07 17:26:45 abw Exp $ +# $Id: Wrap.pm,v 1.42 2002/07/09 14:43:30 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use base qw( GD::Text::Wrap Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/); sub new { @@ -155,8 +155,8 @@ =head1 VERSION -1.40, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.41, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:43:38 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwDK-000Dbg-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:43:38 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:43:38 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Plugin/XML DOM.pm RSS.pm Simple.pm Style.pm XPath.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:43:38 Modified: lib/Template/Plugin/XML DOM.pm RSS.pm Simple.pm Style.pm XPath.pm Log: prep for 2.07c Revision Changes Path 2.41 +2 -2 Template2/lib/Template/Plugin/XML/DOM.pm Index: DOM.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/XML/DOM.pm,v retrieving revision 2.40 retrieving revision 2.41 diff -u -r2.40 -r2.41 --- DOM.pm 2002/07/07 14:43:19 2.40 +++ DOM.pm 2002/07/09 14:43:32 2.41 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: DOM.pm,v 2.40 2002/07/07 14:43:19 abw Exp $ +# $Id: DOM.pm,v 2.41 2002/07/09 14:43:32 abw Exp $ # #============================================================================ @@ -801,7 +801,7 @@ =head1 VERSION 2.6, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. 2.50 +4 -4 Template2/lib/Template/Plugin/XML/RSS.pm Index: RSS.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/XML/RSS.pm,v retrieving revision 2.49 retrieving revision 2.50 diff -u -r2.49 -r2.50 --- RSS.pm 2002/07/07 17:26:46 2.49 +++ RSS.pm 2002/07/09 14:43:32 2.50 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: RSS.pm,v 2.49 2002/07/07 17:26:46 abw Exp $ +# $Id: RSS.pm,v 2.50 2002/07/09 14:43:32 abw Exp $ # #============================================================================ @@ -32,7 +32,7 @@ use Template::Plugin; use XML::RSS; -$VERSION = sprintf("%d.%02d", q$Revision: 2.49 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.50 $ =~ /(\d+)\.(\d+)/); sub load { return $_[0]; @@ -168,8 +168,8 @@ =head1 VERSION -2.48, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.48 +4 -4 Template2/lib/Template/Plugin/XML/Simple.pm Index: Simple.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/XML/Simple.pm,v retrieving revision 2.47 retrieving revision 2.48 diff -u -r2.47 -r2.48 --- Simple.pm 2002/07/07 17:26:46 2.47 +++ Simple.pm 2002/07/09 14:43:33 2.48 @@ -16,7 +16,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Simple.pm,v 2.47 2002/07/07 17:26:46 abw Exp $ +# $Id: Simple.pm,v 2.48 2002/07/09 14:43:33 abw Exp $ # #============================================================================ @@ -31,7 +31,7 @@ use base qw( Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.47 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.48 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ @@ -107,8 +107,8 @@ =head1 VERSION -2.46, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.47, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.21 +5 -5 Template2/lib/Template/Plugin/XML/Style.pm Index: Style.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/XML/Style.pm,v retrieving revision 2.20 retrieving revision 2.21 diff -u -r2.20 -r2.21 --- Style.pm 2002/07/07 17:26:47 2.20 +++ Style.pm 2002/07/09 14:43:33 2.21 @@ -16,7 +16,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Style.pm,v 2.20 2002/07/07 17:26:47 abw Exp $ +# $Id: Style.pm,v 2.21 2002/07/09 14:43:33 abw Exp $ # #============================================================================ @@ -30,7 +30,7 @@ use base qw( Template::Plugin::Filter ); use vars qw( $VERSION $DYNAMIC $FILTER_NAME ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.20 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.21 $ =~ /(\d+)\.(\d+)/); $DYNAMIC = 1; $FILTER_NAME = 'xmlstyle'; @@ -322,7 +322,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -331,8 +331,8 @@ =head1 VERSION -2.19, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.20, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 2.53 +4 -4 Template2/lib/Template/Plugin/XML/XPath.pm Index: XPath.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Plugin/XML/XPath.pm,v retrieving revision 2.52 retrieving revision 2.53 diff -u -r2.52 -r2.53 --- XPath.pm 2002/07/07 17:26:47 2.52 +++ XPath.pm 2002/07/09 14:43:35 2.53 @@ -17,7 +17,7 @@ # #---------------------------------------------------------------------------- # -# $Id: XPath.pm,v 2.52 2002/07/07 17:26:47 abw Exp $ +# $Id: XPath.pm,v 2.53 2002/07/09 14:43:35 abw Exp $ # #============================================================================ @@ -33,7 +33,7 @@ use base qw( Template::Plugin ); use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.52 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); #------------------------------------------------------------------------ @@ -257,8 +257,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:43:42 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwDN-000Dc2-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:43:41 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:43:41 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Stash Context.pm XS.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:43:41 Modified: lib/Template/Stash Context.pm XS.pm Log: prep for 2.07c Revision Changes Path 1.45 +5 -5 Template2/lib/Template/Stash/Context.pm Index: Context.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Stash/Context.pm,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Context.pm 2002/07/07 17:26:48 1.44 +++ Context.pm 2002/07/09 14:43:39 1.45 @@ -65,7 +65,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Context.pm,v 1.44 2002/07/07 17:26:48 abw Exp $ +# $Id: Context.pm,v 1.45 2002/07/09 14:43:39 abw Exp $ # #============================================================================ @@ -77,7 +77,7 @@ use Template::Stash; use vars qw( $VERSION $DEBUG $ROOT_OPS $SCALAR_OPS $HASH_OPS $LIST_OPS ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.44 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.45 $ =~ /(\d+)\.(\d+)/); #======================================================================== @@ -756,7 +756,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -765,8 +765,8 @@ =head1 VERSION -1.43, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +1.44, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.24 +1 -1 Template2/lib/Template/Stash/XS.pm Index: XS.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Stash/XS.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- XS.pm 2002/07/07 14:43:20 1.23 +++ XS.pm 2002/07/09 14:43:40 1.24 @@ -156,7 +156,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. From cvs@template-toolkit.org Tue Jul 09 15:43:44 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwDQ-000Dcf-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:43:44 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:43:44 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Tools tpage.pod ttree.pod Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:43:44 Modified: lib/Template/Tools tpage.pod ttree.pod Log: prep for 2.07c Revision Changes Path 1.49 +3 -3 Template2/lib/Template/Tools/tpage.pod Index: tpage.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Tools/tpage.pod,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- tpage.pod 2002/07/07 17:26:48 1.48 +++ tpage.pod 2002/07/09 14:43:42 1.49 @@ -41,7 +41,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -50,8 +50,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.49 +3 -3 Template2/lib/Template/Tools/ttree.pod Index: ttree.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Tools/ttree.pod,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ttree.pod 2002/07/07 17:26:49 1.48 +++ ttree.pod 2002/07/09 14:43:43 1.49 @@ -88,7 +88,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -97,8 +97,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 15:43:48 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RwDU-000DdB-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 15:43:48 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 15:43:48 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Tutorial Datafile.pod Web.pod Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 14:43:48 Modified: lib/Template/Tutorial Datafile.pod Web.pod Log: prep for 2.07c Revision Changes Path 1.30 +1 -1 Template2/lib/Template/Tutorial/Datafile.pod Index: Datafile.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Tutorial/Datafile.pod,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Datafile.pod 2002/07/07 14:43:21 1.29 +++ Datafile.pod 2002/07/09 14:43:45 1.30 @@ -438,7 +438,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT 1.30 +3 -3 Template2/lib/Template/Tutorial/Web.pod Index: Web.pod =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Tutorial/Web.pod,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Web.pod 2002/07/07 14:43:21 1.29 +++ Web.pod 2002/07/09 14:43:46 1.30 @@ -11,7 +11,7 @@ # toolkit by writing plugins. # # AUTHOR -# Andy Wardley +# Andy Wardley # # COPYRIGHT # Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved. @@ -769,7 +769,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -778,7 +778,7 @@ =head1 VERSION -Template Toolkit version 2.07b, released on 07 July 2002. +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Tue Jul 09 16:50:37 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17RxG9-000ECw-00 for templates-cvs@template-toolkit.org; Tue, 09 Jul 2002 16:50:37 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Tue, 09 Jul 2002 16:50:37 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/src/Release TODO.tt2 Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/09 15:50:37 Modified: docsrc/src/Release TODO.tt2 Log: Removed todo item for uniq. Revision Changes Path 1.14 +1 -3 Template2/docsrc/src/Release/TODO.tt2 Index: TODO.tt2 =================================================================== RCS file: /template-toolkit/Template2/docsrc/src/Release/TODO.tt2,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- TODO.tt2 2001/12/14 11:08:33 1.13 +++ TODO.tt2 2002/07/09 15:50:36 1.14 @@ -12,14 +12,12 @@ # Andy Wardley # #------------------------------------------------------------------------ -# $Id: TODO.tt2,v 1.13 2001/12/14 11:08:33 abw Exp $ +# $Id: TODO.tt2,v 1.14 2002/07/09 15:50:36 darren Exp $ #======================================================================== #------------------------------------------------------------------------ # Miscellaneous #------------------------------------------------------------------------ - -* mylist.sort.uniq * Errors thrown via the Error module are not correctly caught. I looked at this briefly but the problem wasn't immediately obvious and needs some From cvs@template-toolkit.org Fri Jul 12 21:33:18 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17T76L-000NLT-00 for templates-cvs@template-toolkit.org; Fri, 12 Jul 2002 21:33:17 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 12 Jul 2002 21:33:17 +0100 Subject: [Templates-cvs] cvs commit: Template2/parser yc Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/12 20:33:17 Modified: parser yc Log: * Made GRAMMAR, OUTPUT, and PARSER env-var configurable, using := syntax Revision Changes Path 2.2 +3 -3 Template2/parser/yc Index: yc =================================================================== RCS file: /template-toolkit/Template2/parser/yc,v retrieving revision 2.1 retrieving revision 2.2 diff -u -r2.1 -r2.2 --- yc 2000/11/01 12:01:44 2.1 +++ yc 2002/07/12 20:33:15 2.2 @@ -17,9 +17,9 @@ # #======================================================================== -GRAMMAR=Parser.yp -OUTPUT=../lib/Template/Grammar.pm -TEMPLATE=Grammar.pm.skel +: ${GRAMMAR:="Parser.yp"} +: ${OUTPUT:="../lib/Template/Grammar.pm"} +: ${TEMPLATE:="Grammar.pm.skel"} echo "Compiling parser grammar (${GRAMMAR} -> ${OUTPUT})" From cvs@template-toolkit.org Fri Jul 12 21:57:11 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17T7TT-000NWv-00 for templates-cvs@template-toolkit.org; Fri, 12 Jul 2002 21:57:11 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 12 Jul 2002 21:57:11 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Test.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/12 20:57:10 Modified: lib/Template Test.pm Log: * Allows for named tests, in the format -- name: TestName --, as part of test_expect Revision Changes Path 2.54 +10 -5 Template2/lib/Template/Test.pm Index: Test.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Test.pm,v retrieving revision 2.53 retrieving revision 2.54 diff -u -r2.53 -r2.54 --- Test.pm 2002/07/09 14:42:48 2.53 +++ Test.pm 2002/07/12 20:57:09 2.54 @@ -20,7 +20,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Test.pm,v 2.53 2002/07/09 14:42:48 abw Exp $ +# $Id: Test.pm,v 2.54 2002/07/12 20:57:09 darren Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template qw( :template ); use Exporter; -$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.54 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0; @ISA = qw( Exporter ); @EXPORT = qw( ntests ok is match flush test_expect callsign banner ); @@ -254,7 +254,12 @@ # the remaining tests are defined in @tests... foreach $input (@tests) { $count++; + my $name = ""; + if ($input =~ s/\s*-- name: (.*?) --\s*\n//im) { + $name = sprintf "'%s': ", $1; + } + # split input by a line like "-- expect --" ($input, $expect) = split(/^\s*--\s*expect\s*--\s*\n/im, $input); @@ -280,13 +285,13 @@ $tproc->process(\$input, $params, \$output) || do { warn "Template process failed: ", $tproc->error(), "\n"; # report failure and automatically fail the expect match - ok(0, "template test $count process FAILED: " . subtext($input)); + ok(0, "${name}template test $count process FAILED: " . subtext($input)); ok(0, '(obviously did not match expected)'); next; }; # processed OK - ok(1, "template test $count processed OK: " . subtext($input)); + ok(1, "${name}template test $count processed OK: " . subtext($input)); # another hack: if the '-- expect --' section starts with # '-- process --' then we process the expected output @@ -328,7 +333,7 @@ $copyi, $copye, $copyo); } - ok($match, $match ? "matched expected" : "did not match expected"); + ok($match, $match ? "${name}matched expected" : "${name}did not match expected"); }; } From cvs@template-toolkit.org Fri Jul 12 22:12:19 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17T7i6-000Ngt-00 for templates-cvs@template-toolkit.org; Fri, 12 Jul 2002 22:12:18 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 12 Jul 2002 22:12:18 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Test.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/12 21:12:18 Modified: lib/Template Tag: darren-Named_tests Test.pm Log: * Allows for named tests, in the format -- name: TestName --, as part of test_expect Revision Changes Path No revision No revision 2.53.2.1 +10 -5 Template2/lib/Template/Test.pm Index: Test.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Test.pm,v retrieving revision 2.53 retrieving revision 2.53.2.1 diff -u -r2.53 -r2.53.2.1 --- Test.pm 2002/07/09 14:42:48 2.53 +++ Test.pm 2002/07/12 21:12:18 2.53.2.1 @@ -20,7 +20,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Test.pm,v 2.53 2002/07/09 14:42:48 abw Exp $ +# $Id: Test.pm,v 2.53.2.1 2002/07/12 21:12:18 darren Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template qw( :template ); use Exporter; -$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.53.2.1 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0; @ISA = qw( Exporter ); @EXPORT = qw( ntests ok is match flush test_expect callsign banner ); @@ -254,7 +254,12 @@ # the remaining tests are defined in @tests... foreach $input (@tests) { $count++; + my $name = ""; + if ($input =~ s/\s*-- name: (.*?) --\s*\n//im) { + $name = sprintf "'%s': ", $1; + } + # split input by a line like "-- expect --" ($input, $expect) = split(/^\s*--\s*expect\s*--\s*\n/im, $input); @@ -280,13 +285,13 @@ $tproc->process(\$input, $params, \$output) || do { warn "Template process failed: ", $tproc->error(), "\n"; # report failure and automatically fail the expect match - ok(0, "template test $count process FAILED: " . subtext($input)); + ok(0, "${name}template test $count process FAILED: " . subtext($input)); ok(0, '(obviously did not match expected)'); next; }; # processed OK - ok(1, "template test $count processed OK: " . subtext($input)); + ok(1, "${name}template test $count processed OK: " . subtext($input)); # another hack: if the '-- expect --' section starts with # '-- process --' then we process the expected output @@ -328,7 +333,7 @@ $copyi, $copye, $copyo); } - ok($match, $match ? "matched expected" : "did not match expected"); + ok($match, $match ? "${name}matched expected" : "${name}did not match expected"); }; } From cvs@template-toolkit.org Fri Jul 12 22:18:12 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17T7no-000Njv-00 for templates-cvs@template-toolkit.org; Fri, 12 Jul 2002 22:18:12 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 12 Jul 2002 22:18:12 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Service.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/12 21:18:12 Modified: lib/Template Service.pm Log: * Calling _dump was causing "Can't use undefined value as ARRAY ref" for PRE_PROCESS and POST_PROCESS if they were undefined; they assigns them empty arrays by default. Revision Changes Path 2.58 +4 -4 Template2/lib/Template/Service.pm Index: Service.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Service.pm,v retrieving revision 2.57 retrieving revision 2.58 diff -u -r2.57 -r2.58 --- Service.pm 2002/07/09 14:42:48 2.57 +++ Service.pm 2002/07/12 21:18:11 2.58 @@ -19,7 +19,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Service.pm,v 2.57 2002/07/09 14:42:48 abw Exp $ +# $Id: Service.pm,v 2.58 2002/07/12 21:18:11 darren Exp $ # #============================================================================ @@ -34,7 +34,7 @@ use Template::Config; use Template::Exception; -$VERSION = sprintf("%d.%02d", q$Revision: 2.57 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.58 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; @@ -142,7 +142,7 @@ # by splitting on non-word characters foreach $item (qw( PRE_PROCESS PROCESS POST_PROCESS )) { $data = $config->{ $item }; - next unless defined $data; + $self->{ $item } = [ ], next unless (defined $data); $data = [ split($delim, $data || '') ] unless ref $data eq 'ARRAY'; $self->{ $item } = $data; @@ -723,4 +723,4 @@ =head1 SEE ALSO -L, L \ No newline at end of file +L, L From cvs@template-toolkit.org Sat Jul 13 14:30:20 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17TMya-00072n-00 for templates-cvs@template-toolkit.org; Sat, 13 Jul 2002 14:30:20 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Sat, 13 Jul 2002 14:30:20 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Context.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/13 13:30:20 Modified: lib/Template Context.pm Log: * added EXPOSE_BLOCKS option and modified template() method accordingly Revision Changes Path 2.65 +36 -14 Template2/lib/Template/Context.pm Index: Context.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Context.pm,v retrieving revision 2.64 retrieving revision 2.65 diff -u -r2.64 -r2.65 --- Context.pm 2002/07/09 14:42:45 2.64 +++ Context.pm 2002/07/13 13:30:19 2.65 @@ -18,7 +18,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Context.pm,v 2.64 2002/07/09 14:42:45 abw Exp $ +# $Id: Context.pm,v 2.65 2002/07/13 13:30:19 abw Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template::Constants; use Template::Exception; -$VERSION = sprintf("%d.%02d", q$Revision: 2.64 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.65 $ =~ /(\d+)\.(\d+)/); $DEBUG_FORMAT = "\n## \$file line \$line : [% \$text %] ##\n"; @@ -76,7 +76,7 @@ sub template { my ($self, $name) = @_; my ($prefix, $blocks, $defblocks, $provider, $template, $error); - my ($shortname, $providers); + my ($shortname, $blockname, $providers); # references to Template::Document (or sub-class) objects objects, or # CODE references are assumed to be pre-compiled templates and are @@ -120,16 +120,36 @@ || $self->{ LOAD_TEMPLATES } unless $providers; - # finally we try the regular template providers which will + + # Finally we try the regular template providers which will # handle references to files, text, etc., as well as templates - # reference by name - foreach my $provider (@$providers) { - ($template, $error) = $provider->fetch($shortname, $prefix); - return $template unless $error; - if ($error == Template::Constants::STATUS_ERROR) { - $self->throw($template) if ref $template; - $self->throw(Template::Constants::ERROR_FILE, $template); + # reference by name. If + + $blockname = ''; + while ($shortname) { + $self->DEBUG("looking for [$shortname] [$blockname]\n") if $DEBUG; + + foreach my $provider (@$providers) { + ($template, $error) = $provider->fetch($shortname, $prefix); + if ($error) { + if ($error == Template::Constants::STATUS_ERROR) { + $self->throw($template) if ref $template; + $self->throw(Template::Constants::ERROR_FILE, $template); + } + # DECLINE is ok, carry on + } + elsif (length $blockname) { + return $template + if $template = $template->blocks->{ $blockname }; + } + else { + return $template; + } } + + last if ref $shortname || ! $self->{ EXPOSE_BLOCKS }; + $shortname =~ s{/([^/]+)$}{} || last; + $blockname = length $blockname ? "$1/$blockname" : $1; } $self->throw(Template::Constants::ERROR_FILE, "$name: not found"); @@ -785,8 +805,10 @@ $self->{ TRIM } = $config->{ TRIM } || 0; $self->{ BLKSTACK } = [ ]; $self->{ CONFIG } = $config; - $self->{ DEBUG_FORMAT } = $config->{ DEBUG_FORMAT }; - + $self->{ DEBUG_FORMAT } = $config->{ DEBUG_FORMAT }; + $self->{ EXPOSE_BLOCKS } = defined $config->{ EXPOSE_BLOCKS } + ? $config->{ EXPOSE_BLOCKS } + : 0; return $self; } @@ -1452,4 +1474,4 @@ =head1 SEE ALSO -L, L, L, L, L, L, L, L \ No newline at end of file +L, L, L, L, L, L, L, L From cvs@template-toolkit.org Sat Jul 13 14:31:00 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17TMzD-00073X-00 for templates-cvs@template-toolkit.org; Sat, 13 Jul 2002 14:30:59 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Sat, 13 Jul 2002 14:30:59 +0100 Subject: [Templates-cvs] cvs commit: Template2/parser Parser.yp Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/13 13:30:59 Modified: parser Parser.yp Log: * modified defblock to correctly construct names of nested BLOCK defs Revision Changes Path 2.13 +18 -11 Template2/parser/Parser.yp Index: Parser.yp =================================================================== RCS file: /template-toolkit/Template2/parser/Parser.yp,v retrieving revision 2.12 retrieving revision 2.13 diff -u -r2.12 -r2.13 --- Parser.yp 2002/05/03 12:08:13 2.12 +++ Parser.yp 2002/07/13 13:30:59 2.13 @@ -37,7 +37,7 @@ # #------------------------------------------------------------------------ # -# $Id: Parser.yp,v 2.12 2002/05/03 12:08:13 abw Exp $ +# $Id: Parser.yp,v 2.13 2002/07/13 13:30:59 abw Exp $ # #======================================================================== @@ -236,17 +236,24 @@ lnameargs { $factory->filter(@_[3,1]) } ; -#defblock: BLOCK blockname ';' -# template END { $_[0]->define_block(@_[2, 4]); -# undef } -#; -defblock: BLOCK blockname blockargs ';' - template END { local $" = ', '; - print STDERR "experimental block args: [@{ $_[3] }]\n" - if $_[3]; - $_[0]->define_block(@_[2, 5]); - undef } +defblock: defblockname + blockargs ';' + template END { my $name = join('/', @{ $_[0]->{ DEFBLOCKS } }); + pop(@{ $_[0]->{ DEFBLOCKS } }); + $_[0]->define_block($name, $_[4]); + undef + } ; + +# removed for now +# print STDERR "experimental block args: [@{ $_[3] }]\n" if $_[3]; + +defblockname: BLOCK blockname { push(@{ $_[0]->{ DEFBLOCKS } }, $_[2]); + $_[2]; + } +; + + blockname: filename | LITERAL { $_[1] =~ s/^'(.*)'$/$1/; $_[1] } From cvs@template-toolkit.org Sat Jul 13 14:35:34 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17TN3e-0007AY-00 for templates-cvs@template-toolkit.org; Sat, 13 Jul 2002 14:35:34 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Sat, 13 Jul 2002 14:35:34 +0100 Subject: [Templates-cvs] cvs commit: Template2/t blocks.t Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/13 13:35:34 Added: t blocks.t Log: added t/blocks.t Revision Changes Path 1.1 Template2/t/blocks.t Index: blocks.t =================================================================== #============================================================= -*-perl-*- # # t/blocks.t # # Test ability to INCLUDE/PROCESS a block in a template. # # Written by Andy Wardley # # Copyright (C) 1996-2000 Andy Wardley. All Rights Reserved. # Copyright (C) 1998-2000 Canon Research Centre Europe Ltd. # # This is free software; you can redistribute it and/or modify it # under the same terms as Perl itself. # # $Id: blocks.t,v 1.1 2002/07/13 13:35:33 abw Exp $ # #======================================================================== use strict; use lib qw( ./lib ../lib ); use Template::Test; use Template::Provider; use Cwd; $^W = 1; my $DEBUG = grep(/-d/, @ARGV); #$Template::Parser::DEBUG = $DEBUG; #$Template::Directive::PRETTY = $DEBUG; $Template::Provider::DEBUG = $DEBUG; $Template::Context::DEBUG = $DEBUG; my $path = cwd; my $dir = -d 'test/lib' ? "$path/test/lib" : "$path/t/test/lib"; my $tt1 = Template->new({ INCLUDE_PATH => [ qw( t/test/lib test/lib ) ], ABSOLUTE => 1, }); my $tt2 = Template->new({ INCLUDE_PATH => [ qw( t/test/lib test/lib ) ], EXPOSE_BLOCKS => 1, ABSOLUTE => 1, }); my $vars = { a => 'alpha', b => 'bravo', dir => $dir, }; test_expect(\*DATA, [ off => $tt1, on => $tt2 ], $vars); __DATA__ -- test -- [% TRY; INCLUDE blockdef/block1; CATCH; error; END %] -- expect -- file error - blockdef/block1: not found -- test -- -- use on -- [% INCLUDE blockdef/block1 %] -- expect -- This is block 1, defined in blockdef, a is alpha -- test -- [% INCLUDE blockdef/block1 a='amazing' %] -- expect -- This is block 1, defined in blockdef, a is amazing -- test -- [% TRY; INCLUDE blockdef/none; CATCH; error; END %] -- expect -- file error - blockdef/none: not found -- test -- [% INCLUDE "$dir/blockdef/block1" a='abstract' %] -- expect -- This is block 1, defined in blockdef, a is abstract -- test -- [% BLOCK one -%] block one [% BLOCK two -%] this is block two, b is [% b %] [% END -%] two has been defined, let's now include it [% INCLUDE one/two b='brilliant' -%] end of block one [% END -%] [% INCLUDE one -%] = [% INCLUDE one/two b='brazen'-%] --expect -- block one two has been defined, let's now include it this is block two, b is brilliant end of block one = this is block two, b is brazen From cvs@template-toolkit.org Wed Jul 17 20:28:30 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17UuTO-000OS3-00 for templates-cvs@template-toolkit.org; Wed, 17 Jul 2002 20:28:30 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Wed, 17 Jul 2002 20:28:30 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Context.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/17 19:28:30 Modified: lib/Template Tag: darren-Merged_process_include Context.pm Log: Merged process() and include() implementations. Revision Changes Path No revision No revision 2.65.2.1 +61 -86 Template2/lib/Template/Context.pm Index: Context.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Context.pm,v retrieving revision 2.65 retrieving revision 2.65.2.1 diff -u -r2.65 -r2.65.2.1 --- Context.pm 2002/07/13 13:30:19 2.65 +++ Context.pm 2002/07/17 19:28:28 2.65.2.1 @@ -18,7 +18,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Context.pm,v 2.65 2002/07/13 13:30:19 abw Exp $ +# $Id: Context.pm,v 2.65.2.1 2002/07/17 19:28:28 darren Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template::Constants; use Template::Exception; -$VERSION = sprintf("%d.%02d", q$Revision: 2.65 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.65.2.1 $ =~ /(\d+)\.(\d+)/); $DEBUG_FORMAT = "\n## \$file line \$line : [% \$text %] ##\n"; @@ -238,7 +238,7 @@ #------------------------------------------------------------------------ -# view(\%coonfig) +# view(\%config) # # Create a new Template::View bound to this context. #------------------------------------------------------------------------ @@ -253,21 +253,24 @@ #------------------------------------------------------------------------ -# process($template, \%params) [% PROCESS template var = val, ... %] +# process($template, \%params) [% PROCESS template var = val, ... %] +# process($template, \%params, $localize) [% INCLUDE template var = val, ... %] # # Processes the template named or referenced by the first parameter. # The optional second parameter may reference a hash array of variable -# definitions. These are set before the template is processed by calling -# update() on the stash. Note that the context is not localised and -# these, and any other variables set in the template will retain their -# new values after this method returns. +# definitions. These are set before the template is processed by +# calling update() on the stash. Note that, unless the third parameter +# is true, the context is not localised and these, and any other +# variables set in the template will retain their new values after this +# method returns. The third parameter is in place so that this method +# can handle INCLUDE calls: the stash will be localized. # # Returns the output of processing the template. Errors are thrown # as Template::Exception objects via die(). #------------------------------------------------------------------------ sub process { - my ($self, $template, $params) = @_; + my ($self, $template, $params, $localize) = @_; my ($trim, $blocks) = @$self{ qw( TRIM BLOCKS ) }; my (@compiled, $name, $compiled); my ($stash, $tblocks, $error, $tmpout); @@ -279,87 +282,35 @@ foreach $name (@$template) { push(@compiled, $self->template($name)); } - - # update stash with any new parameters passed - $self->{ STASH }->update($params); - $stash = $self->{ STASH }; - - foreach $name (@$template) { - $compiled = shift @compiled; - my $element = ref $compiled eq 'CODE' - ? { (name => (ref $name ? '' : $name), modtime => time()) } - : $compiled; - $stash->set('component', $element); - - # merge any local blocks defined in the Template::Document into our - # local BLOCKS cache - @$blocks{ keys %$tblocks } = values %$tblocks - if UNIVERSAL::isa($compiled, 'Template::Document') - && ($tblocks = $compiled->blocks()); - - if (ref $compiled eq 'CODE') { - $tmpout = &$compiled($self); - } - elsif (ref $compiled) { - $tmpout = $compiled->process($self); - } - else { - $self->throw('file', - "invalid template reference: $compiled"); - } - - if ($trim) { - for ($tmpout) { - s/^\s+//; - s/\s+$//; - } - } - $output .= $tmpout; - } - - return $output; -} - - -#------------------------------------------------------------------------ -# include($template, \%params) [% INCLUDE template var = val, ... %] -# -# Similar to process() above but processing the template in a local -# context. Any variables passed by reference to a hash as the second -# parameter will be set before the template is processed and then -# revert to their original values before the method returns. Similarly, -# any changes made to non-global variables within the template will -# persist only until the template is processed. -# -# Returns the output of processing the template. Errors are thrown -# as Template::Exception objects via die(). -#------------------------------------------------------------------------ - -sub include { - my ($self, $template, $params) = @_; - my $trim = $self->{ TRIM }; - my (@compiled, $name, $compiled); - my ($stash, $error, $tmpout); - my $output = ''; - - $template = [ $template ] unless ref $template eq 'ARRAY'; - # fetch compiled template for each name specified - foreach $name (@$template) { - push(@compiled, $self->template($name)); + if ($localize) { + # localise the variable stash with any parameters passed + $stash = $self->{ STASH } = $self->{ STASH }->clone($params); + } else { + # update stash with any new parameters passed + $self->{ STASH }->update($params); + $stash = $self->{ STASH }; } - # localise the variable stash with any parameters passed - $stash = $self->{ STASH } = $self->{ STASH }->clone($params); - eval { foreach $name (@$template) { $compiled = shift @compiled; my $element = ref $compiled eq 'CODE' ? { (name => (ref $name ? '' : $name), modtime => time()) } - : $compiled; + : $compiled; $stash->set('component', $element); - + + unless ($localize) { + # merge any local blocks defined in the Template::Document + # into our local BLOCKS cache + # dlc: Why does this only occur in process() and not in + # include()? I've maintained this split, but it makes + # me wonder... + @$blocks{ keys %$tblocks } = values %$tblocks + if UNIVERSAL::isa($compiled, 'Template::Document') + && ($tblocks = $compiled->blocks()); + } + if (ref $compiled eq 'CODE') { $tmpout = &$compiled($self); } @@ -368,9 +319,9 @@ } else { $self->throw('file', - "invalid template reference: $compiled"); + "invalid template reference: $compiled"); } - + if ($trim) { for ($tmpout) { s/^\s+//; @@ -381,17 +332,40 @@ } }; $error = $@; - # ensure stash is delocalised before dying - $self->{ STASH } = $self->{ STASH }->declone(); + + if ($localize) { + # ensure stash is delocalised before dying + $self->{ STASH } = $self->{ STASH }->declone(); + } + $self->throw(ref $error ? $error : (Template::Constants::ERROR_FILE, $error)) if $error; - + return $output; } #------------------------------------------------------------------------ +# include($template, \%params) [% INCLUDE template var = val, ... %] +# +# Similar to process() above but processing the template in a local +# context. Any variables passed by reference to a hash as the second +# parameter will be set before the template is processed and then +# revert to their original values before the method returns. Similarly, +# any changes made to non-global variables within the template will +# persist only until the template is processed. +# +# Returns the output of processing the template. Errors are thrown +# as Template::Exception objects via die(). +#------------------------------------------------------------------------ + +sub include { + my ($self, $template, $params) = @_; + return $self->process($template, $params, 'localize me!'); +} + +#------------------------------------------------------------------------ # insert($file) # # Insert the contents of a file without parsing. @@ -1475,3 +1449,4 @@ =head1 SEE ALSO L, L, L, L, L, L, L, L + From cvs@template-toolkit.org Wed Jul 17 21:13:11 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17UvAc-000OnK-00 for templates-cvs@template-toolkit.org; Wed, 17 Jul 2002 21:13:10 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Wed, 17 Jul 2002 21:13:10 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Test.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/17 20:13:10 Modified: lib/Template Tag: darren-Named_tests Test.pm Log: (recommit) Revision Changes Path No revision No revision 2.53.2.2 +8 -13 Template2/lib/Template/Test.pm Index: Test.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Test.pm,v retrieving revision 2.53.2.1 retrieving revision 2.53.2.2 diff -u -r2.53.2.1 -r2.53.2.2 --- Test.pm 2002/07/12 21:12:18 2.53.2.1 +++ Test.pm 2002/07/17 20:13:10 2.53.2.2 @@ -20,7 +20,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Test.pm,v 2.53.2.1 2002/07/12 21:12:18 darren Exp $ +# $Id: Test.pm,v 2.53.2.2 2002/07/17 20:13:10 darren Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template qw( :template ); use Exporter; -$VERSION = sprintf("%d.%02d", q$Revision: 2.53.2.1 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.53.2.2 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0; @ISA = qw( Exporter ); @EXPORT = qw( ntests ok is match flush test_expect callsign banner ); @@ -254,12 +254,7 @@ # the remaining tests are defined in @tests... foreach $input (@tests) { $count++; - my $name = ""; - if ($input =~ s/\s*-- name: (.*?) --\s*\n//im) { - $name = sprintf "'%s': ", $1; - } - # split input by a line like "-- expect --" ($input, $expect) = split(/^\s*--\s*expect\s*--\s*\n/im, $input); @@ -285,13 +280,13 @@ $tproc->process(\$input, $params, \$output) || do { warn "Template process failed: ", $tproc->error(), "\n"; # report failure and automatically fail the expect match - ok(0, "${name}template test $count process FAILED: " . subtext($input)); + ok(0, "template test $count process FAILED: " . subtext($input)); ok(0, '(obviously did not match expected)'); next; }; # processed OK - ok(1, "${name}template test $count processed OK: " . subtext($input)); + ok(1, "template test $count processed OK: " . subtext($input)); # another hack: if the '-- expect --' section starts with # '-- process --' then we process the expected output @@ -333,7 +328,7 @@ $copyi, $copye, $copyo); } - ok($match, $match ? "${name}matched expected" : "${name}did not match expected"); + ok($match, $match ? "matched expected" : "did not match expected"); }; } @@ -653,7 +648,7 @@ =head1 AUTHOR -Andy Wardley Eabw@andywardley.comE +Andy Wardley Eabw@kfs.orgE L @@ -662,8 +657,8 @@ =head1 VERSION -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07b, released on 07 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Wed Jul 17 21:13:26 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17UvAs-000Ong-00 for templates-cvs@template-toolkit.org; Wed, 17 Jul 2002 21:13:26 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Wed, 17 Jul 2002 21:13:26 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Test.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/17 20:13:26 Modified: lib/Template Tag: darren-Named_tests Test.pm Log: (recommit) Revision Changes Path No revision No revision 2.53.2.3 +13 -8 Template2/lib/Template/Test.pm Index: Test.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Test.pm,v retrieving revision 2.53.2.2 retrieving revision 2.53.2.3 diff -u -r2.53.2.2 -r2.53.2.3 --- Test.pm 2002/07/17 20:13:10 2.53.2.2 +++ Test.pm 2002/07/17 20:13:26 2.53.2.3 @@ -20,7 +20,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Test.pm,v 2.53.2.2 2002/07/17 20:13:10 darren Exp $ +# $Id: Test.pm,v 2.53.2.3 2002/07/17 20:13:26 darren Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template qw( :template ); use Exporter; -$VERSION = sprintf("%d.%02d", q$Revision: 2.53.2.2 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.53.2.3 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0; @ISA = qw( Exporter ); @EXPORT = qw( ntests ok is match flush test_expect callsign banner ); @@ -254,7 +254,12 @@ # the remaining tests are defined in @tests... foreach $input (@tests) { $count++; + my $name = ""; + if ($input =~ s/\s*-- name: (.*?) --\s*\n//im) { + $name = sprintf "'%s': ", $1; + } + # split input by a line like "-- expect --" ($input, $expect) = split(/^\s*--\s*expect\s*--\s*\n/im, $input); @@ -280,13 +285,13 @@ $tproc->process(\$input, $params, \$output) || do { warn "Template process failed: ", $tproc->error(), "\n"; # report failure and automatically fail the expect match - ok(0, "template test $count process FAILED: " . subtext($input)); + ok(0, "${name}template test $count process FAILED: " . subtext($input)); ok(0, '(obviously did not match expected)'); next; }; # processed OK - ok(1, "template test $count processed OK: " . subtext($input)); + ok(1, "${name}template test $count processed OK: " . subtext($input)); # another hack: if the '-- expect --' section starts with # '-- process --' then we process the expected output @@ -328,7 +333,7 @@ $copyi, $copye, $copyo); } - ok($match, $match ? "matched expected" : "did not match expected"); + ok($match, $match ? "${name}matched expected" : "${name}did not match expected"); }; } @@ -648,7 +653,7 @@ =head1 AUTHOR -Andy Wardley Eabw@kfs.orgE +Andy Wardley Eabw@andywardley.comE L @@ -657,8 +662,8 @@ =head1 VERSION -2.51, distributed as part of the -Template Toolkit version 2.07b, released on 07 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 09 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Thu Jul 18 17:58:47 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VEc3-0007QF-00 for templates-cvs@template-toolkit.org; Thu, 18 Jul 2002 17:58:47 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Thu, 18 Jul 2002 17:58:47 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/lib authors Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/18 16:58:46 Modified: docsrc/lib authors Log: Added myself to authors list (for culpibility purposes) Revision Changes Path 1.3 +5 -1 Template2/docsrc/lib/authors Index: authors =================================================================== RCS file: /template-toolkit/Template2/docsrc/lib/authors,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- authors 2002/07/08 14:38:59 1.2 +++ authors 2002/07/18 16:58:45 1.3 @@ -12,5 +12,9 @@ name = 'Dave Cross' email = 'dave@dave.org.uk' } + darren = { + name = 'Darren Chamberlain' + email = 'dlc@users.sourceforge.net' + } } --%] \ No newline at end of file +-%] From cvs@template-toolkit.org Fri Jul 19 04:59:51 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VOvm-000COG-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 04:59:50 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 04:59:50 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Stash.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 03:59:50 Modified: lib/Template Stash.pm Log: * Added merge (list) virtual method, which takes one list and concatenates zero or more other lists. * Added commify (scalar) virtual method, from perlfaq5, with configurability input from the template list, particularly Eric Cholet, Shaun Guth, and Mark Mills. Revision Changes Path 2.65 +18 -3 Template2/lib/Template/Stash.pm Index: Stash.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Stash.pm,v retrieving revision 2.64 retrieving revision 2.65 diff -u -r2.64 -r2.65 --- Stash.pm 2002/07/09 14:42:48 2.64 +++ Stash.pm 2002/07/19 03:59:49 2.65 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Stash.pm,v 2.64 2002/07/09 14:42:48 abw Exp $ +# $Id: Stash.pm,v 2.65 2002/07/19 03:59:49 darren Exp $ # #============================================================================ @@ -29,7 +29,7 @@ use strict; use vars qw( $VERSION $DEBUG $ROOT_OPS $SCALAR_OPS $HASH_OPS $LIST_OPS ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.64 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.65 $ =~ /(\d+)\.(\d+)/); #======================================================================== @@ -89,6 +89,7 @@ return [ defined $split ? split($split, $str, @args) : split(' ', $str, @args) ]; }, + 'commify' => \&commify, defined $SCALAR_OPS ? %$SCALAR_OPS : (), }; @@ -180,6 +181,10 @@ @$list }, 'unique' => sub { my %u; [ grep { ++$u{$_} == 1 } @{$_[0]} ] }, + 'merge' => sub { + my $list = shift; + return [ @$list, grep defined, map ref eq 'ARRAY' ? @$_ : undef, @_ ]; + }, defined $LIST_OPS ? %$LIST_OPS : (), }; @@ -190,6 +195,16 @@ return ''; } +# stolen from perlfaq 5 +sub commify { + local $_ = shift; + my $c = shift || ","; + my $n = int(shift || 3); + return $_ if $n<1; + 1 while s/^([-+]?\d+)(\d{$n})/$1$c$2/; + return $_; +} + #======================================================================== # ----- CLASS METHODS ----- @@ -891,4 +906,4 @@ =head1 SEE ALSO -L, L \ No newline at end of file +L, L From cvs@template-toolkit.org Fri Jul 19 04:59:53 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VOvp-000COW-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 04:59:53 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 04:59:53 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/src/Manual Variables.tt2 Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 03:59:53 Modified: docsrc/src/Manual Variables.tt2 Log: * Added merge (list) virtual method, which takes one list and concatenates zero or more other lists. * Added commify (scalar) virtual method, from perlfaq5, with configurability input from the template list, particularly Eric Cholet, Shaun Guth, and Mark Mills. Revision Changes Path 1.11 +29 -0 Template2/docsrc/src/Manual/Variables.tt2 Index: Variables.tt2 =================================================================== RCS file: /template-toolkit/Template2/docsrc/src/Manual/Variables.tt2,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Variables.tt2 2002/07/08 19:42:56 1.10 +++ Variables.tt2 2002/07/19 03:59:52 1.11 @@ -544,6 +544,23 @@ Always returns 1 for scalar values. This method is provided for consistency with the hash and list size methods. +=item commify + +Applies the commify function from perlfaq5 ("How can I output my +numbers with commas added?"), with optionally configurable separators +(default to ",") and an optionally configurable number of grouped +numbers (defaults to 3). + + [% big_number = 1234567890 %] + [% big_number.commify %] + [% big_number.commify(".") %] + [% big_number.commify(",", 4) %] + 1,234,567,890 + 1.234.567.890 + 12,3456,7890 + +Usually, commify without options does The Right Thing. + =back The following can be called against hash references. @@ -710,6 +727,18 @@ command line utility). [% numbers = mylist.unique.sort %] + +=item merge + +Returns a list composed of zero or more other lists: + + [% list_one = [ 1 2 3 ]; + list_two = [ 4 5 6 ]; + list_three = [ 7 8 9 ]; + list_four = list_one.merge(list_two, list_three); + %] + +The original lists are not modified. =back From cvs@template-toolkit.org Fri Jul 19 04:59:54 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VOvq-000COi-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 04:59:54 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 04:59:54 +0100 Subject: [Templates-cvs] cvs commit: Template2/t vmeth.t Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 03:59:54 Modified: t vmeth.t Log: * Added merge (list) virtual method, which takes one list and concatenates zero or more other lists. * Added commify (scalar) virtual method, from perlfaq5, with configurability input from the template list, particularly Eric Cholet, Shaun Guth, and Mark Mills. Revision Changes Path 2.15 +41 -1 Template2/t/vmeth.t Index: vmeth.t =================================================================== RCS file: /template-toolkit/Template2/t/vmeth.t,v retrieving revision 2.14 retrieving revision 2.15 diff -u -r2.14 -r2.15 --- vmeth.t 2002/07/08 18:04:38 2.14 +++ vmeth.t 2002/07/19 03:59:53 2.15 @@ -13,7 +13,7 @@ # This is free software; you can redistribute it and/or modify it # under the same terms as Perl itself. # -# $Id: vmeth.t,v 2.14 2002/07/08 18:04:38 darren Exp $ +# $Id: vmeth.t,v 2.15 2002/07/19 03:59:53 darren Exp $ # #======================================================================== @@ -314,6 +314,46 @@ [% duplicates.unique.join(', ') %] --expect -- 1, 2, 3, 4, 5 + +-- test -- +[% duplicates.unique.join(', ') %] +-- expect -- +1, 2, 3, 4, 5 + +-- test -- +[% big_num = "1234567890"; big_num.commify %] +-- expect -- +1,234,567,890 + +-- test -- +[% big_num = "1234567890"; big_num.commify(":", 2) %] +-- expect -- +12:34:56:78:90 + +-- test -- +[% big_num = "1234567812345678"; big_num.commify(" ", 4) %] +-- expect -- +1234 5678 1234 5678 + +-- test -- +[% big_num = "hello world"; big_num.commify %] +-- expect -- +hello world + +-- test -- +[% list_one = [ 1 2 3 ]; + list_two = [ 4 5 6 ]; + "'$l' " FOREACH l = list_one.merge(list_two) %] +-- expect -- +'1' '2' '3' '4' '5' '6' + +-- test -- +[% list_one = [ 1 2 3 ]; + list_two = [ 4 5 6 ]; + list_three = [ 7 8 9 0 ]; + "'$l' " FOREACH l = list_one.merge(list_two, list_three) %] +-- expect -- +'1' '2' '3' '4' '5' '6' '7' '8' '9' '0' # USER DEFINED LIST OPS From cvs@template-toolkit.org Fri Jul 19 07:48:28 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VRYy-000DSw-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 07:48:28 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 07:48:28 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Provider.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 06:48:27 Modified: lib/Template Provider.pm Log: * changed the provided to test for a file with -f and return declined if not found, rather than test to see if open() fails. This makes it a little more robust Revision Changes Path 2.60 +21 -16 Template2/lib/Template/Provider.pm Index: Provider.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Provider.pm,v retrieving revision 2.59 retrieving revision 2.60 diff -u -r2.59 -r2.60 --- Provider.pm 2002/07/09 14:42:47 2.59 +++ Provider.pm 2002/07/19 06:48:26 2.60 @@ -27,7 +27,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Provider.pm,v 2.59 2002/07/09 14:42:47 abw Exp $ +# $Id: Provider.pm,v 2.60 2002/07/19 06:48:26 abw Exp $ # #============================================================================ @@ -44,7 +44,7 @@ use File::Basename; use File::Spec; -$VERSION = sprintf("%d.%02d", q$Revision: 2.59 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.60 $ =~ /(\d+)\.(\d+)/); # name of document class $DOCUMENT = 'Template::Document' unless defined $DOCUMENT; @@ -626,21 +626,26 @@ load => 0, }; } - elsif (open(FH, $name)) { - my $text = ; - $data = { - name => $alias, - text => $text, - time => (stat $name)[9], - load => $now, - }; - } - elsif ($tolerant) { - ($data, $error) = (undef, Template::Constants::STATUS_DECLINED); + elsif (-f $name) { + if (open(FH, $name)) { + my $text = ; + $data = { + name => $alias, + text => $text, + time => (stat $name)[9], + load => $now, + }; + } + elsif ($tolerant) { + ($data, $error) = (undef, Template::Constants::STATUS_DECLINED); + } + else { + $data = "$alias: $!"; + $error = Template::Constants::STATUS_ERROR; + } } else { - $data = "$alias: $!"; - $error = Template::Constants::STATUS_ERROR; + ($data, $error) = (undef, Template::Constants::STATUS_DECLINED); } } @@ -1403,4 +1408,4 @@ =head1 SEE ALSO -L, L, L \ No newline at end of file +L, L, L From cvs@template-toolkit.org Fri Jul 19 13:59:47 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXMI-000HmJ-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 13:59:46 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 13:59:46 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template/Namespace Constants.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 12:59:46 Modified: lib/Template/Namespace Constants.pm Log: * fixed ident() method to generate Perl code to dynamically resolve the variable at runtime if it resolved undefined or to a reference at compile time Revision Changes Path 1.8 +23 -10 Template2/lib/Template/Namespace/Constants.pm Index: Constants.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Namespace/Constants.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Constants.pm 2002/07/09 14:42:57 1.7 +++ Constants.pm 2002/07/19 12:59:45 1.8 @@ -17,7 +17,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Constants.pm,v 1.7 2002/07/09 14:42:57 abw Exp $ +# $Id: Constants.pm,v 1.8 2002/07/19 12:59:45 abw Exp $ # #============================================================================ @@ -26,12 +26,13 @@ use strict; use Template::Base; use Template::Config; +use Template::Directive; use Template::Exception; use base qw( Template::Base ); use vars qw( $VERSION $DEBUG ); -$VERSION = sprintf("%d.%02d", q$Revision: 1.7 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 1.8 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0 unless defined $DEBUG; @@ -50,6 +51,7 @@ sub ident { my ($self, $ident) = @_; + my @save = @$ident; # discard first node indicating constants namespace splice(@$ident, 0, 2); @@ -62,28 +64,39 @@ foreach $e (0..$nelems-1) { # node name must be a constant - die "cannot fold constant ", $ident->[$e * 2], "\n" - unless $ident->[$e * 2] =~ s/^'(.+)'$/$1/s; + unless ($ident->[$e * 2] =~ s/^'(.+)'$/$1/s) { + $self->DEBUG(" * deferred (non-constant item: ", $ident->[$e * 2], ")\n") + if $DEBUG; + return Template::Directive->ident(\@save); + } # if args is non-zero then it must be eval'ed if ($ident->[$e * 2 + 1]) { my $args = $ident->[$e * 2 + 1]; my $comp = eval "$args"; - die "cannot compile constant arguments: $args\n" if $@; - print STDERR "($args) " if $comp && $DEBUG; + if ($@) { + $self->DEBUG(" * deferred (non-constant args: $args)\n") if $DEBUG; + return Template::Directive->ident(\@save); + } + $self->DEBUG("($args) ") if $comp && $DEBUG; $ident->[$e * 2 + 1] = $comp; } } + $result = $self->{ STASH }->get($ident); - die "undefined constant [ @$ident ]\n" unless defined $result; + if (! length $result || ref $result) { + my $reason = length $result ? 'reference' : 'no result'; + $self->DEBUG(" * deferred ($reason)\n") if $DEBUG; + return Template::Directive->ident(\@save); + } + $result =~ s/'/\\'/; - print STDERR "=> '$result'\n" if $DEBUG; + $self->DEBUG(" * resolved => '$result'\n") if $DEBUG; return "'$result'"; - } 1; @@ -179,4 +192,4 @@ =head1 SEE ALSO -L \ No newline at end of file +L From cvs@template-toolkit.org Fri Jul 19 14:00:19 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXMp-000HoS-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:00:19 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:00:19 +0100 Subject: [Templates-cvs] cvs commit: Template2/t constants.t Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:00:19 Modified: t constants.t Log: * added test to check constants resolved to referenced get deferred Revision Changes Path 1.3 +11 -1 Template2/t/constants.t Index: constants.t =================================================================== RCS file: /template-toolkit/Template2/t/constants.t,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- constants.t 2002/07/08 16:09:23 1.2 +++ constants.t 2002/07/19 13:00:19 1.3 @@ -12,7 +12,7 @@ # This is free software; you can redistribute it and/or modify it # under the same terms as Perl itself. # -# $Id: constants.t,v 1.2 2002/07/08 16:09:23 abw Exp $ +# $Id: constants.t,v 1.3 2002/07/19 13:00:19 abw Exp $ # #======================================================================== @@ -140,7 +140,9 @@ my $vars = { col => { user => 'red', + luza => 'blue', }, + constants => $constants, }; test_expect(\*DATA, $engines, $vars); @@ -200,3 +202,11 @@ -- expect -- fave back col orange + +-- test -- +-- use tt2 -- +-- name defer references -- +[% "$key\n" FOREACH key = constants.col.keys.sort %] +-- expect -- +back +text From cvs@template-toolkit.org Fri Jul 19 14:01:07 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXNb-000Hr0-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:01:07 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:01:07 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Test.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:01:07 Modified: lib/Template Test.pm Log: * applied changes to support names for test Revision Changes Path 2.54 +14 -6 Template2/lib/Template/Test.pm Index: Test.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Test.pm,v retrieving revision 2.53 retrieving revision 2.54 diff -u -r2.53 -r2.54 --- Test.pm 2002/07/09 14:42:48 2.53 +++ Test.pm 2002/07/19 13:01:06 2.54 @@ -20,7 +20,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Test.pm,v 2.53 2002/07/09 14:42:48 abw Exp $ +# $Id: Test.pm,v 2.54 2002/07/19 13:01:06 abw Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template qw( :template ); use Exporter; -$VERSION = sprintf("%d.%02d", q$Revision: 2.53 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.54 $ =~ /(\d+)\.(\d+)/); $DEBUG = 0; @ISA = qw( Exporter ); @EXPORT = qw( ntests ok is match flush test_expect callsign banner ); @@ -254,7 +254,15 @@ # the remaining tests are defined in @tests... foreach $input (@tests) { $count++; + my $name = ''; + if ($input =~ s/^\s*-- name:? (.*?) --\s*\n//im) { + $name = $1; + } + else { + $name = "template text $count"; + } + # split input by a line like "-- expect --" ($input, $expect) = split(/^\s*--\s*expect\s*--\s*\n/im, $input); @@ -280,13 +288,13 @@ $tproc->process(\$input, $params, \$output) || do { warn "Template process failed: ", $tproc->error(), "\n"; # report failure and automatically fail the expect match - ok(0, "template test $count process FAILED: " . subtext($input)); + ok(0, "$name process FAILED: " . subtext($input)); ok(0, '(obviously did not match expected)'); next; }; # processed OK - ok(1, "template test $count processed OK: " . subtext($input)); + ok(1, "$name processed OK: " . subtext($input)); # another hack: if the '-- expect --' section starts with # '-- process --' then we process the expected output @@ -328,7 +336,7 @@ $copyi, $copye, $copyo); } - ok($match, $match ? "matched expected" : "did not match expected"); + ok($match, $match ? "$name matched expected" : "$name did not match expected"); }; } @@ -670,4 +678,4 @@ =head1 SEE ALSO -L \ No newline at end of file +L From cvs@template-toolkit.org Fri Jul 19 14:07:03 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXTL-000Hu8-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:07:03 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:07:03 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Stash.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:07:03 Modified: lib/Template Stash.pm Log: * added slice and splice list virtual methods * added chunk scalar virtual method, removed commify Revision Changes Path 2.66 +59 -14 Template2/lib/Template/Stash.pm Index: Stash.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Stash.pm,v retrieving revision 2.65 retrieving revision 2.66 diff -u -r2.65 -r2.66 --- Stash.pm 2002/07/19 03:59:49 2.65 +++ Stash.pm 2002/07/19 13:07:02 2.66 @@ -18,7 +18,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Stash.pm,v 2.65 2002/07/19 03:59:49 darren Exp $ +# $Id: Stash.pm,v 2.66 2002/07/19 13:07:02 abw Exp $ # #============================================================================ @@ -29,7 +29,7 @@ use strict; use vars qw( $VERSION $DEBUG $ROOT_OPS $SCALAR_OPS $HASH_OPS $LIST_OPS ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.65 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.66 $ =~ /(\d+)\.(\d+)/); #======================================================================== @@ -89,7 +89,26 @@ return [ defined $split ? split($split, $str, @args) : split(' ', $str, @args) ]; }, - 'commify' => \&commify, + 'chunk' => sub { + my ($string, $size) = @_; + my @list; + $size ||= 1; + if ($size < 0) { + # sexeger! It's faster to reverse the string, search + # it from the front and then reverse the output than to + # search it from the end, believe it nor not! + $string = reverse $string; + $size = -$size; + unshift(@list, scalar reverse $1) + while ($string =~ /((.{$size})|(.+))/g); + } + else { + push(@list, $1) while ($string =~ /((.{$size})|(.+))/g); + } + return \@list; + }, + + defined $SCALAR_OPS ? %$SCALAR_OPS : (), }; @@ -135,8 +154,16 @@ 'shift' => sub { my $list = shift; shift(@$list) }, 'max' => sub { local $^W = 0; my $list = shift; $#$list; }, 'size' => sub { local $^W = 0; my $list = shift; $#$list + 1; }, - 'first' => sub { my $list = shift; $list->[0] }, - 'last' => sub { my $list = shift; $list->[$#$list] }, + 'first' => sub { + my $list = shift; + return $list->[0] unless @_; + return [ @$list[0..$_[0]-1] ]; + }, + 'last' => sub { + my $list = shift; + return $list->[-1] unless @_; + return [ @$list[-$_[0]..-1] ]; + }, 'reverse' => sub { my $list = shift; [ reverse @$list ] }, 'grep' => sub { my ($list, $pattern) = @_; @@ -185,6 +212,33 @@ my $list = shift; return [ @$list, grep defined, map ref eq 'ARRAY' ? @$_ : undef, @_ ]; }, + 'slice' => sub { + my ($list, $from, $to) = @_; + $from ||= 0; + $to = $#$list unless defined $to; + return [ @$list[$from..$to] ]; + }, + 'splice' => sub { + my ($list, $offset, $length, @replace) = @_; + + if (@replace) { + # @replace can contain a list of multiple replace items, or + # be a single reference to a list + @replace = @{ $replace[0] } + if @replace == 1 && ref $replace[0] eq 'ARRAY'; + return [ splice @$list, $offset, $length, @replace ]; + } + elsif (defined $length) { + return [ splice @$list, $offset, $length ]; + } + elsif (defined $offset) { + return [ splice @$list, $offset ]; + } + else { + return [ splice(@$list) ]; + } + }, + defined $LIST_OPS ? %$LIST_OPS : (), }; @@ -195,15 +249,6 @@ return ''; } -# stolen from perlfaq 5 -sub commify { - local $_ = shift; - my $c = shift || ","; - my $n = int(shift || 3); - return $_ if $n<1; - 1 while s/^([-+]?\d+)(\d{$n})/$1$c$2/; - return $_; -} #======================================================================== From cvs@template-toolkit.org Fri Jul 19 14:13:07 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXZD-000Hym-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:13:07 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:13:07 +0100 Subject: [Templates-cvs] cvs commit: Template2/t vmeth.t Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:13:07 Modified: t vmeth.t Log: * added new tests for splice, slice and chunk virtual methods Revision Changes Path 2.16 +137 -1 Template2/t/vmeth.t Index: vmeth.t =================================================================== RCS file: /template-toolkit/Template2/t/vmeth.t,v retrieving revision 2.15 retrieving revision 2.16 diff -u -r2.15 -r2.16 --- vmeth.t 2002/07/19 03:59:53 2.15 +++ vmeth.t 2002/07/19 13:13:06 2.16 @@ -13,7 +13,7 @@ # This is free software; you can redistribute it and/or modify it # under the same terms as Perl itself. # -# $Id: vmeth.t,v 2.15 2002/07/19 03:59:53 darren Exp $ +# $Id: vmeth.t,v 2.16 2002/07/19 13:13:06 abw Exp $ # #======================================================================== @@ -32,6 +32,16 @@ $Template::Stash::LIST_OPS->{ odd } = \&odd; $Template::Stash::LIST_OPS->{ jumble } = \&jumble; +$Template::Stash::SCALAR_OPS->{ commify } = sub { + local $_ = shift; + my $c = shift || ","; + my $n = int(shift || 3); + return $_ if $n<1; + 1 while s/^([-+]?\d+)(\d{$n})/$1$c$2/; + return $_; +}; + + #------------------------------------------------------------------------ # define a simple object to test sort vmethod calling object method #------------------------------------------------------------------------ @@ -340,6 +350,7 @@ -- expect -- hello world + -- test -- [% list_one = [ 1 2 3 ]; list_two = [ 4 5 6 ]; @@ -355,7 +366,130 @@ -- expect -- '1' '2' '3' '4' '5' '6' '7' '8' '9' '0' +-- test -- +[% list_one = [ 1 2 3 4 5 ] -%] +a: [% list_one.splice.join(', ') %] +b: [% list_one.size ? list_one.join(', ') : 'empty list' %] +-- expect -- +a: 1, 2, 3, 4, 5 +b: empty list + +-- test -- +[% list_one = [ 'a' 'b' 'c' 'd' 'e' ] -%] +a: [% list_one.splice(3).join(', ') %] +b: [% list_one.join(', ') %] +-- expect -- +a: d, e +b: a, b, c + +-- test -- +[% list_one = [ 'a' 'b' 'c' 'd' 'e' ] -%] +c: [% list_one.splice(3, 1).join(', ') %] +d: [% list_one.join(', ') %] +-- expect -- +c: d +d: a, b, c, e + +-- test -- +[% list_one = [ 'a' 'b' 'c' 'd' 'e' ] -%] +c: [% list_one.splice(3, 1, 'foo').join(', ') %] +d: [% list_one.join(', ') %] +e: [% list_one.splice(0, 1, 'ping', 'pong').join(', ') %] +f: [% list_one.join(', ') %] +g: [% list_one.splice(-1, 1, ['wibble', 'wobble']).join(', ') %] +h: [% list_one.join(', ') %] +-- expect -- +c: d +d: a, b, c, foo, e +e: a +f: ping, pong, b, c, foo, e +g: e +h: ping, pong, b, c, foo, wibble, wobble + +-- test -- +-- name scrabble -- +[% play_game = [ 'play', 'scrabble' ]; + ping_pong = [ 'ping', 'pong' ] -%] +a: [% play_game.splice(1, 1, ping_pong).join %] +b: [% play_game.join %] +-- expect -- +a: scrabble +b: play ping pong + + +-- test -- +-- name first -- +[% primes = [ 2, 3, 5, 7, 11, 13 ] -%] +[% primes.first +%] +[% primes.first(3).join(', ') %] +-- expect -- +2 +2, 3, 5 + +-- test -- +-- name first -- +[% primes = [ 2, 3, 5, 7, 11, 13 ] -%] +[% primes.last +%] +[% primes.last(3).join(', ') %] +-- expect -- +13 +7, 11, 13 + + +-- test -- +-- name slice -- +[% primes = [ 2, 3, 5, 7, 11, 13 ] -%] +[% primes.slice(0, 2).join(', ') +%] +[% primes.slice(-2, -1).join(', ') +%] +[% primes.slice(3).join(', ') +%] +[% primes.slice.join(', ') +%] +--expect -- +2, 3, 5 +11, 13 +7, 11, 13 +2, 3, 5, 7, 11, 13 + +-- test -- +-- name chunk left -- +[% string = 'TheCatSatTheMat' -%] +[% string.chunk(3).join(', ') %] +-- expect -- +The, Cat, Sat, The, Mat + +-- test -- +-- name chunk leftover -- +[% string = 'TheCatSatonTheMat' -%] +[% string.chunk(3).join(', ') %] +-- expect -- +The, Cat, Sat, onT, heM, at + +-- test -- +-- name chunk right -- +[% string = 'TheCatSatTheMat' -%] +[% string.chunk(-3).join(', ') %] +-- expect -- +The, Cat, Sat, The, Mat + +-- test -- +-- name chunk rightover -- +[% string = 'TheCatSatonTheMat' -%] +[% string.chunk(-3).join(', ') %] +-- expect -- +Th, eCa, tSa, ton, The, Mat + +-- test -- +-- name chunk ccard -- +[% ccard_no = "1234567824683579"; + ccard_no.chunk(4).join +%] +-- expect -- +1234 5678 2468 3579 + + + +#------------------------------------------------------------------------ # USER DEFINED LIST OPS +#------------------------------------------------------------------------ -- test -- [% items = [0..6] -%] @@ -466,6 +600,8 @@ -- expect -- matched animal: cat place: mat no match + + -- stop -- From cvs@template-toolkit.org Fri Jul 19 14:17:16 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXdE-000I1P-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:17:16 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:17:16 +0100 Subject: [Templates-cvs] cvs commit: Template2/t debug.t Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:17:16 Modified: t debug.t Log: fixed broken tests Revision Changes Path 2.6 +46 -18 Template2/t/debug.t Index: debug.t =================================================================== RCS file: /template-toolkit/Template2/t/debug.t,v retrieving revision 2.5 retrieving revision 2.6 diff -u -r2.5 -r2.6 --- debug.t 2002/07/07 14:17:45 2.5 +++ debug.t 2002/07/19 13:17:16 2.6 @@ -11,7 +11,7 @@ # This is free software; you can redistribute it and/or modify it # under the same terms as Perl itself. # -# $Id: debug.t,v 2.5 2002/07/07 14:17:45 abw Exp $ +# $Id: debug.t,v 2.6 2002/07/19 13:17:16 abw Exp $ # #======================================================================== @@ -24,7 +24,7 @@ no warnings; my $DEBUG = grep(/-d/, @ARGV); -$Template::Parser::DEBUG = $DEBUG; +#$Template::Parser::DEBUG = $DEBUG; $Template::Directive::Pretty = $DEBUG; $Template::Test::PRESERVE = 1; @@ -66,6 +66,22 @@ -- test -- Hello World foo: [% foo %] +-- expect -- +Hello World +foo: 10 + +-- test -- +-- use debug -- +Hello World +foo: [% foo %] +-- expect -- +Hello World +foo: 10 + +-- test -- +-- use default -- +Hello World +foo: [% foo %] [% DEBUG on -%] Debugging enabled foo: [% foo %] @@ -73,29 +89,35 @@ Hello World foo: 10 Debugging enabled -foo: 10 +foo: 10 -- test -- +-- use debug -- +[% DEBUG off %] +Hello World foo: [% foo %] [% DEBUG on -%] -hello [% "$baz.ping/$baz.pong" %] world -[% DEBUG off %] -bar: [% bar %] +Debugging enabled +foo: [% foo %] -- expect -- + +Hello World foo: 10 -hello 100/200 world - -bar: 20 +Debugging enabled +foo: 10 -- test -- -[% INCLUDE foo a=10 %] -[% DEBUG on -%] -[% INCLUDE foo a=20 %] -[% foo %] +foo: [% foo %] +hello [% "$baz.ping/$baz.pong" %] world +[% DEBUG off %] +bar: [% bar %][% DEBUG on %] -- expect -- -This is the foo file, a is 10 -This is the foo file, a is 20 -10 +foo: 10 +hello 100/200 world + +bar: 20 + + -- test -- -- use debug -- @@ -106,10 +128,15 @@ [% INCLUDE foo a=20 %] -- expect -- foo: 10 -This is the foo file, a is 10 +This is the foo file, a is 10 foo: 10 -This is the foo file, a is 20 +This is the foo file, a is 20 + +-- stop -- + + + -- test -- -- use default -- [% DEBUG on -%] @@ -118,6 +145,7 @@ -- expect -- [ input text line 3 ]10 + -- test -- -- use default -- From cvs@template-toolkit.org Fri Jul 19 14:22:57 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXij-000I3x-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:22:57 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:22:57 +0100 Subject: [Templates-cvs] cvs commit: Template2/parser Parser.yp Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:22:57 Modified: parser Parser.yp Log: * changed to defblock to generate correct naming of nested BLOCKs Revision Changes Path 2.14 +1 -5 Template2/parser/Parser.yp Index: Parser.yp =================================================================== RCS file: /template-toolkit/Template2/parser/Parser.yp,v retrieving revision 2.13 retrieving revision 2.14 diff -u -r2.13 -r2.14 --- Parser.yp 2002/07/13 13:30:59 2.13 +++ Parser.yp 2002/07/19 13:22:57 2.14 @@ -37,7 +37,7 @@ # #------------------------------------------------------------------------ # -# $Id: Parser.yp,v 2.13 2002/07/13 13:30:59 abw Exp $ +# $Id: Parser.yp,v 2.14 2002/07/19 13:22:57 abw Exp $ # #======================================================================== @@ -134,6 +134,7 @@ $factory->debug($_[2]); } else { +# print STDERR "debug ($_[0]->{ DEBUG }) @{$_[2]->[0]}\n"; $_[0]->{ DEBUG } ? $factory->debug($_[2]) : ''; } } @@ -245,15 +246,10 @@ } ; -# removed for now -# print STDERR "experimental block args: [@{ $_[3] }]\n" if $_[3]; - defblockname: BLOCK blockname { push(@{ $_[0]->{ DEFBLOCKS } }, $_[2]); $_[2]; } ; - - blockname: filename | LITERAL { $_[1] =~ s/^'(.*)'$/$1/; $_[1] } From cvs@template-toolkit.org Fri Jul 19 14:29:43 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXpG-000I8e-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:29:42 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:29:42 +0100 Subject: [Templates-cvs] cvs commit: Template2/lib/Template Context.pm Directive.pm Grammar.pm Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:29:42 Modified: lib/Template Context.pm Directive.pm Grammar.pm Log: * merged darren's changes to Template::Context for include()/process() into main branch * rebuilt grammar for parser changes Revision Changes Path 2.66 +63 -87 Template2/lib/Template/Context.pm Index: Context.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Context.pm,v retrieving revision 2.65 retrieving revision 2.66 diff -u -r2.65 -r2.66 --- Context.pm 2002/07/13 13:30:19 2.65 +++ Context.pm 2002/07/19 13:29:38 2.66 @@ -18,7 +18,7 @@ # modify it under the same terms as Perl itself. # # REVISION -# $Id: Context.pm,v 2.65 2002/07/13 13:30:19 abw Exp $ +# $Id: Context.pm,v 2.66 2002/07/19 13:29:38 abw Exp $ # #============================================================================ @@ -35,7 +35,7 @@ use Template::Constants; use Template::Exception; -$VERSION = sprintf("%d.%02d", q$Revision: 2.65 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.66 $ =~ /(\d+)\.(\d+)/); $DEBUG_FORMAT = "\n## \$file line \$line : [% \$text %] ##\n"; @@ -238,7 +238,7 @@ #------------------------------------------------------------------------ -# view(\%coonfig) +# view(\%config) # # Create a new Template::View bound to this context. #------------------------------------------------------------------------ @@ -253,21 +253,24 @@ #------------------------------------------------------------------------ -# process($template, \%params) [% PROCESS template var = val, ... %] +# process($template, \%params) [% PROCESS template var = val, ... %] +# process($template, \%params, $localize) [% INCLUDE template var = val, ... %] # # Processes the template named or referenced by the first parameter. # The optional second parameter may reference a hash array of variable -# definitions. These are set before the template is processed by calling -# update() on the stash. Note that the context is not localised and -# these, and any other variables set in the template will retain their -# new values after this method returns. +# definitions. These are set before the template is processed by +# calling update() on the stash. Note that, unless the third parameter +# is true, the context is not localised and these, and any other +# variables set in the template will retain their new values after this +# method returns. The third parameter is in place so that this method +# can handle INCLUDE calls: the stash will be localized. # # Returns the output of processing the template. Errors are thrown # as Template::Exception objects via die(). #------------------------------------------------------------------------ sub process { - my ($self, $template, $params) = @_; + my ($self, $template, $params, $localize) = @_; my ($trim, $blocks) = @$self{ qw( TRIM BLOCKS ) }; my (@compiled, $name, $compiled); my ($stash, $tblocks, $error, $tmpout); @@ -279,87 +282,35 @@ foreach $name (@$template) { push(@compiled, $self->template($name)); } - - # update stash with any new parameters passed - $self->{ STASH }->update($params); - $stash = $self->{ STASH }; - - foreach $name (@$template) { - $compiled = shift @compiled; - my $element = ref $compiled eq 'CODE' - ? { (name => (ref $name ? '' : $name), modtime => time()) } - : $compiled; - $stash->set('component', $element); - - # merge any local blocks defined in the Template::Document into our - # local BLOCKS cache - @$blocks{ keys %$tblocks } = values %$tblocks - if UNIVERSAL::isa($compiled, 'Template::Document') - && ($tblocks = $compiled->blocks()); - - if (ref $compiled eq 'CODE') { - $tmpout = &$compiled($self); - } - elsif (ref $compiled) { - $tmpout = $compiled->process($self); - } - else { - $self->throw('file', - "invalid template reference: $compiled"); - } - - if ($trim) { - for ($tmpout) { - s/^\s+//; - s/\s+$//; - } - } - $output .= $tmpout; - } - - return $output; -} - - -#------------------------------------------------------------------------ -# include($template, \%params) [% INCLUDE template var = val, ... %] -# -# Similar to process() above but processing the template in a local -# context. Any variables passed by reference to a hash as the second -# parameter will be set before the template is processed and then -# revert to their original values before the method returns. Similarly, -# any changes made to non-global variables within the template will -# persist only until the template is processed. -# -# Returns the output of processing the template. Errors are thrown -# as Template::Exception objects via die(). -#------------------------------------------------------------------------ - -sub include { - my ($self, $template, $params) = @_; - my $trim = $self->{ TRIM }; - my (@compiled, $name, $compiled); - my ($stash, $error, $tmpout); - my $output = ''; - - $template = [ $template ] unless ref $template eq 'ARRAY'; - # fetch compiled template for each name specified - foreach $name (@$template) { - push(@compiled, $self->template($name)); + if ($localize) { + # localise the variable stash with any parameters passed + $stash = $self->{ STASH } = $self->{ STASH }->clone($params); + } else { + # update stash with any new parameters passed + $self->{ STASH }->update($params); + $stash = $self->{ STASH }; } - # localise the variable stash with any parameters passed - $stash = $self->{ STASH } = $self->{ STASH }->clone($params); - eval { foreach $name (@$template) { $compiled = shift @compiled; my $element = ref $compiled eq 'CODE' ? { (name => (ref $name ? '' : $name), modtime => time()) } - : $compiled; + : $compiled; $stash->set('component', $element); - + + unless ($localize) { + # merge any local blocks defined in the Template::Document + # into our local BLOCKS cache + # dlc: Why does this only occur in process() and not in + # include()? I've maintained this split, but it makes + # me wonder... + @$blocks{ keys %$tblocks } = values %$tblocks + if UNIVERSAL::isa($compiled, 'Template::Document') + && ($tblocks = $compiled->blocks()); + } + if (ref $compiled eq 'CODE') { $tmpout = &$compiled($self); } @@ -368,9 +319,9 @@ } else { $self->throw('file', - "invalid template reference: $compiled"); + "invalid template reference: $compiled"); } - + if ($trim) { for ($tmpout) { s/^\s+//; @@ -381,17 +332,40 @@ } }; $error = $@; - # ensure stash is delocalised before dying - $self->{ STASH } = $self->{ STASH }->declone(); + + if ($localize) { + # ensure stash is delocalised before dying + $self->{ STASH } = $self->{ STASH }->declone(); + } + $self->throw(ref $error ? $error : (Template::Constants::ERROR_FILE, $error)) if $error; - + return $output; } #------------------------------------------------------------------------ +# include($template, \%params) [% INCLUDE template var = val, ... %] +# +# Similar to process() above but processing the template in a local +# context. Any variables passed by reference to a hash as the second +# parameter will be set before the template is processed and then +# revert to their original values before the method returns. Similarly, +# any changes made to non-global variables within the template will +# persist only until the template is processed. +# +# Returns the output of processing the template. Errors are thrown +# as Template::Exception objects via die(). +#------------------------------------------------------------------------ + +sub include { + my ($self, $template, $params) = @_; + return $self->process($template, $params, 'localize me!'); +} + +#------------------------------------------------------------------------ # insert($file) # # Insert the contents of a file without parsing. @@ -663,6 +637,7 @@ my $hash = ref $_[-1] eq 'HASH' ? pop : { }; my @args = @_; +# print "*** debug(@args)\n"; if (@args) { if ($args[0] =~ /^on|1$/i) { $self->{ DEBUG } = 1; @@ -805,7 +780,7 @@ $self->{ TRIM } = $config->{ TRIM } || 0; $self->{ BLKSTACK } = [ ]; $self->{ CONFIG } = $config; - $self->{ DEBUG_FORMAT } = $config->{ DEBUG_FORMAT }; + $self->{ DEBUG_FORMAT } = $config->{ DEBUG_FORMAT }; $self->{ EXPOSE_BLOCKS } = defined $config->{ EXPOSE_BLOCKS } ? $config->{ EXPOSE_BLOCKS } : 0; @@ -1475,3 +1450,4 @@ =head1 SEE ALSO L, L, L, L, L, L, L, L + 2.16 +3 -2 Template2/lib/Template/Directive.pm Index: Directive.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Directive.pm,v retrieving revision 2.15 retrieving revision 2.16 diff -u -r2.15 -r2.16 --- Directive.pm 2002/07/08 16:05:42 2.15 +++ Directive.pm 2002/07/19 13:29:38 2.16 @@ -25,7 +25,7 @@ # #---------------------------------------------------------------------------- # -# $Id: Directive.pm,v 2.15 2002/07/08 16:05:42 abw Exp $ +# $Id: Directive.pm,v 2.16 2002/07/19 13:29:38 abw Exp $ # #============================================================================ @@ -41,7 +41,7 @@ use base qw( Template::Base ); use vars qw( $VERSION $DEBUG $PRETTY $WHILE_MAX ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.15 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.16 $ =~ /(\d+)\.(\d+)/); $WHILE_MAX = 1000 unless defined $WHILE_MAX; $PRETTY = 0 unless defined $PRETTY; @@ -994,6 +994,7 @@ my $hash = shift @$args; $args = join(', ', @$file, @$args); $args .= @$hash ? ', { ' . join(', ', @$hash) . ' }' : ''; +# print STDERR "factory debug($args)\n"; return "$OUTPUT \$context->debug($args); ## DEBUG ##"; } 2.17 +109 -108 Template2/lib/Template/Grammar.pm Index: Grammar.pm =================================================================== RCS file: /template-toolkit/Template2/lib/Template/Grammar.pm,v retrieving revision 2.16 retrieving revision 2.17 diff -u -r2.16 -r2.17 --- Grammar.pm 2002/07/13 13:31:44 2.16 +++ Grammar.pm 2002/07/19 13:29:38 2.17 @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------ # -# $Id: Grammar.pm,v 2.16 2002/07/13 13:31:44 abw Exp $ +# $Id: Grammar.pm,v 2.17 2002/07/19 13:29:38 abw Exp $ # #======================================================================== @@ -37,7 +37,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = sprintf("%d.%02d", q$Revision: 2.16 $ =~ /(\d+)\.(\d+)/); +$VERSION = sprintf("%d.%02d", q$Revision: 2.17 $ =~ /(\d+)\.(\d+)/); my (@RESERVED, %CMPOP, $LEXTABLE, $RULES, $STATES); my ($factory, $rawstart); @@ -5327,6 +5327,7 @@ $factory->debug($_[2]); } else { +# print STDERR "debug ($_[0]->{ DEBUG }) @{$_[2]->[0]}\n"; $_[0]->{ DEBUG } ? $factory->debug($_[2]) : ''; } } @@ -5340,207 +5341,207 @@ [#Rule 44 'condition', 6, sub -#line 145 "Parser.yp" +#line 146 "Parser.yp" { $factory->if(@_[2, 4, 5]) } ], [#Rule 45 'condition', 3, sub -#line 146 "Parser.yp" +#line 147 "Parser.yp" { $factory->if(@_[3, 1]) } ], [#Rule 46 'condition', 6, sub -#line 148 "Parser.yp" +#line 149 "Parser.yp" { $factory->if("!($_[2])", @_[4, 5]) } ], [#Rule 47 'condition', 3, sub -#line 149 "Parser.yp" +#line 150 "Parser.yp" { $factory->if("!($_[3])", $_[1]) } ], [#Rule 48 'else', 5, sub -#line 153 "Parser.yp" +#line 154 "Parser.yp" { unshift(@{$_[5]}, [ @_[2, 4] ]); $_[5]; } ], [#Rule 49 'else', 3, sub -#line 155 "Parser.yp" +#line 156 "Parser.yp" { [ $_[3] ] } ], [#Rule 50 'else', 0, sub -#line 156 "Parser.yp" +#line 157 "Parser.yp" { [ undef ] } ], [#Rule 51 'switch', 6, sub -#line 160 "Parser.yp" +#line 161 "Parser.yp" { $factory->switch(@_[2, 5]) } ], [#Rule 52 'case', 5, sub -#line 164 "Parser.yp" +#line 165 "Parser.yp" { unshift(@{$_[5]}, [ @_[2, 4] ]); $_[5]; } ], [#Rule 53 'case', 4, sub -#line 166 "Parser.yp" +#line 167 "Parser.yp" { [ $_[4] ] } ], [#Rule 54 'case', 3, sub -#line 167 "Parser.yp" +#line 168 "Parser.yp" { [ $_[3] ] } ], [#Rule 55 'case', 0, sub -#line 168 "Parser.yp" +#line 169 "Parser.yp" { [ undef ] } ], [#Rule 56 '@1-3', 0, sub -#line 171 "Parser.yp" +#line 172 "Parser.yp" { $_[0]->{ INFOR }++ } ], [#Rule 57 'loop', 6, sub -#line 172 "Parser.yp" +#line 173 "Parser.yp" { $_[0]->{ INFOR }--; $factory->foreach(@{$_[2]}, $_[5]) } ], [#Rule 58 'loop', 3, sub -#line 176 "Parser.yp" +#line 177 "Parser.yp" { $factory->foreach(@{$_[3]}, $_[1]) } ], [#Rule 59 '@2-3', 0, sub -#line 177 "Parser.yp" +#line 178 "Parser.yp" { $_[0]->{ INWHILE }++ } ], [#Rule 60 'loop', 6, sub -#line 178 "Parser.yp" +#line 179 "Parser.yp" { $_[0]->{ INWHILE }--; $factory->while(@_[2, 5]) } ], [#Rule 61 'loop', 3, sub -#line 180 "Parser.yp" +#line 181 "Parser.yp" { $factory->while(@_[3, 1]) } ], [#Rule 62 'loopvar', 4, sub -#line 183 "Parser.yp" +#line 184 "Parser.yp" { [ @_[1, 3, 4] ] } ], [#Rule 63 'loopvar', 2, sub -#line 184 "Parser.yp" +#line 185 "Parser.yp" { [ 0, @_[1, 2] ] } ], [#Rule 64 'wrapper', 5, sub -#line 188 "Parser.yp" +#line 189 "Parser.yp" { $factory->wrapper(@_[2, 4]) } ], [#Rule 65 'wrapper', 3, sub -#line 190 "Parser.yp" +#line 191 "Parser.yp" { $factory->wrapper(@_[3, 1]) } ], [#Rule 66 'try', 5, sub -#line 194 "Parser.yp" +#line 195 "Parser.yp" { $factory->try(@_[3, 4]) } ], [#Rule 67 'final', 5, sub -#line 198 "Parser.yp" +#line 199 "Parser.yp" { unshift(@{$_[5]}, [ @_[2,4] ]); $_[5]; } ], [#Rule 68 'final', 5, sub -#line 201 "Parser.yp" +#line 202 "Parser.yp" { unshift(@{$_[5]}, [ undef, $_[4] ]); $_[5]; } ], [#Rule 69 'final', 4, sub -#line 204 "Parser.yp" +#line 205 "Parser.yp" { unshift(@{$_[4]}, [ undef, $_[3] ]); $_[4]; } ], [#Rule 70 'final', 3, sub -#line 206 "Parser.yp" +#line 207 "Parser.yp" { [ $_[3] ] } ], [#Rule 71 'final', 0, sub -#line 207 "Parser.yp" +#line 208 "Parser.yp" { [ 0 ] } ], [#Rule 72 'use', 2, sub -#line 210 "Parser.yp" +#line 211 "Parser.yp" { $factory->use($_[2]) } ], [#Rule 73 '@3-3', 0, sub -#line 213 "Parser.yp" +#line 214 "Parser.yp" { $_[0]->push_defblock(); } ], [#Rule 74 'view', 6, sub -#line 214 "Parser.yp" +#line 215 "Parser.yp" { $factory->view(@_[2,5], $_[0]->pop_defblock) } ], [#Rule 75 '@4-2', 0, sub -#line 218 "Parser.yp" +#line 219 "Parser.yp" { ${$_[0]->{ INPERL }}++; } ], [#Rule 76 'perl', 5, sub -#line 219 "Parser.yp" +#line 220 "Parser.yp" { ${$_[0]->{ INPERL }}--; $_[0]->{ EVAL_PERL } ? $factory->perl($_[4]) @@ -5549,14 +5550,14 @@ [#Rule 77 '@5-1', 0, sub -#line 225 "Parser.yp" +#line 226 "Parser.yp" { ${$_[0]->{ INPERL }}++; $rawstart = ${$_[0]->{'LINE'}}; } ], [#Rule 78 'rawperl', 5, sub -#line 227 "Parser.yp" +#line 228 "Parser.yp" { ${$_[0]->{ INPERL }}--; $_[0]->{ EVAL_PERL } ? $factory->rawperl($_[4], $rawstart) @@ -5565,19 +5566,19 @@ [#Rule 79 'filter', 5, sub -#line 234 "Parser.yp" +#line 235 "Parser.yp" { $factory->filter(@_[2,4]) } ], [#Rule 80 'filter', 3, sub -#line 236 "Parser.yp" +#line 237 "Parser.yp" { $factory->filter(@_[3,1]) } ], [#Rule 81 'defblock', 5, sub -#line 241 "Parser.yp" +#line 242 "Parser.yp" { my $name = join('/', @{ $_[0]->{ DEFBLOCKS } }); pop(@{ $_[0]->{ DEFBLOCKS } }); $_[0]->define_block($name, $_[4]); @@ -5587,7 +5588,7 @@ [#Rule 82 'defblockname', 2, sub -#line 251 "Parser.yp" +#line 249 "Parser.yp" { push(@{ $_[0]->{ DEFBLOCKS } }, $_[2]); $_[2]; } @@ -5598,7 +5599,7 @@ [#Rule 84 'blockname', 1, sub -#line 259 "Parser.yp" +#line 255 "Parser.yp" { $_[1] =~ s/^'(.*)'$/$1/; $_[1] } ], [#Rule 85 @@ -5610,7 +5611,7 @@ [#Rule 87 'anonblock', 5, sub -#line 267 "Parser.yp" +#line 263 "Parser.yp" { local $" = ', '; print STDERR "experimental block args: [@{ $_[2] }]\n" if $_[2]; @@ -5619,19 +5620,19 @@ [#Rule 88 'capture', 3, sub -#line 273 "Parser.yp" +#line 269 "Parser.yp" { $factory->capture(@_[1, 3]) } ], [#Rule 89 'macro', 6, sub -#line 277 "Parser.yp" +#line 273 "Parser.yp" { $factory->macro(@_[2, 6, 4]) } ], [#Rule 90 'macro', 3, sub -#line 278 "Parser.yp" +#line 274 "Parser.yp" { $factory->macro(@_[2, 3]) } ], [#Rule 91 @@ -5640,31 +5641,31 @@ [#Rule 92 'mdir', 4, sub -#line 282 "Parser.yp" +#line 278 "Parser.yp" { $_[3] } ], [#Rule 93 'margs', 2, sub -#line 285 "Parser.yp" +#line 281 "Parser.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 94 'margs', 2, sub -#line 286 "Parser.yp" +#line 282 "Parser.yp" { $_[1] } ], [#Rule 95 'margs', 1, sub -#line 287 "Parser.yp" +#line 283 "Parser.yp" { [ $_[1] ] } ], [#Rule 96 'metadata', 2, sub -#line 290 "Parser.yp" +#line 286 "Parser.yp" { push(@{$_[1]}, @{$_[2]}); $_[1] } ], [#Rule 97 @@ -5676,7 +5677,7 @@ [#Rule 99 'meta', 3, sub -#line 295 "Parser.yp" +#line 291 "Parser.yp" { for ($_[3]) { s/^'//; s/'$//; s/\\'/'/g }; [ @_[1,3] ] } @@ -5684,13 +5685,13 @@ [#Rule 100 'meta', 5, sub -#line 298 "Parser.yp" +#line 294 "Parser.yp" { [ @_[1,4] ] } ], [#Rule 101 'meta', 3, sub -#line 299 "Parser.yp" +#line 295 "Parser.yp" { [ @_[1,3] ] } ], [#Rule 102 @@ -5702,43 +5703,43 @@ [#Rule 104 'lterm', 3, sub -#line 311 "Parser.yp" +#line 307 "Parser.yp" { "[ $_[2] ]" } ], [#Rule 105 'lterm', 3, sub -#line 312 "Parser.yp" +#line 308 "Parser.yp" { "[ $_[2] ]" } ], [#Rule 106 'lterm', 2, sub -#line 313 "Parser.yp" +#line 309 "Parser.yp" { "[ ]" } ], [#Rule 107 'lterm', 3, sub -#line 314 "Parser.yp" +#line 310 "Parser.yp" { "{ $_[2] }" } ], [#Rule 108 'sterm', 1, sub -#line 317 "Parser.yp" +#line 313 "Parser.yp" { $factory->ident($_[1]) } ], [#Rule 109 'sterm', 2, sub -#line 318 "Parser.yp" +#line 314 "Parser.yp" { $factory->identref($_[2]) } ], [#Rule 110 'sterm', 3, sub -#line 319 "Parser.yp" +#line 315 "Parser.yp" { $factory->quoted($_[2]) } ], [#Rule 111 @@ -5750,7 +5751,7 @@ [#Rule 113 'list', 2, sub -#line 324 "Parser.yp" +#line 320 "Parser.yp" { "$_[1], $_[2]" } ], [#Rule 114 @@ -5762,7 +5763,7 @@ [#Rule 116 'range', 3, sub -#line 329 "Parser.yp" +#line 325 "Parser.yp" { $_[1] . '..' . $_[3] } ], [#Rule 117 @@ -5771,13 +5772,13 @@ [#Rule 118 'hash', 0, sub -#line 334 "Parser.yp" +#line 330 "Parser.yp" { "" } ], [#Rule 119 'params', 2, sub -#line 337 "Parser.yp" +#line 333 "Parser.yp" { "$_[1], $_[2]" } ], [#Rule 120 @@ -5789,25 +5790,25 @@ [#Rule 122 'param', 3, sub -#line 342 "Parser.yp" +#line 338 "Parser.yp" { "$_[1] => $_[3]" } ], [#Rule 123 'param', 3, sub -#line 343 "Parser.yp" +#line 339 "Parser.yp" { "$_[1] => $_[3]" } ], [#Rule 124 'ident', 3, sub -#line 346 "Parser.yp" +#line 342 "Parser.yp" { push(@{$_[1]}, @{$_[3]}); $_[1] } ], [#Rule 125 'ident', 3, sub -#line 347 "Parser.yp" +#line 343 "Parser.yp" { push(@{$_[1]}, map {($_, 0)} split(/\./, $_[3])); $_[1]; } @@ -5818,31 +5819,31 @@ [#Rule 127 'node', 1, sub -#line 353 "Parser.yp" +#line 349 "Parser.yp" { [ $_[1], 0 ] } ], [#Rule 128 'node', 4, sub -#line 354 "Parser.yp" +#line 350 "Parser.yp" { [ $_[1], $factory->args($_[3]) ] } ], [#Rule 129 'item', 1, sub -#line 357 "Parser.yp" +#line 353 "Parser.yp" { "'$_[1]'" } ], [#Rule 130 'item', 3, sub -#line 358 "Parser.yp" +#line 354 "Parser.yp" { $_[2] } ], [#Rule 131 'item', 2, sub -#line 359 "Parser.yp" +#line 355 "Parser.yp" { $_[0]->{ V1DOLLAR } ? "'$_[2]'" : $factory->ident(["'$_[2]'", 0]) } @@ -5850,79 +5851,79 @@ [#Rule 132 'expr', 3, sub -#line 364 "Parser.yp" +#line 360 "Parser.yp" { "$_[1] $_[2] $_[3]" } ], [#Rule 133 'expr', 3, sub -#line 365 "Parser.yp" +#line 361 "Parser.yp" { "$_[1] $_[2] $_[3]" } ], [#Rule 134 'expr', 3, sub -#line 366 "Parser.yp" +#line 362 "Parser.yp" { "$_[1] $_[2] $_[3]" } ], [#Rule 135 'expr', 3, sub -#line 367 "Parser.yp" +#line 363 "Parser.yp" { "int($_[1] / $_[3])" } ], [#Rule 136 'expr', 3, sub -#line 368 "Parser.yp" +#line 364 "Parser.yp" { "$_[1] % $_[3]" } ], [#Rule 137 'expr', 3, sub -#line 369 "Parser.yp" +#line 365 "Parser.yp" { "$_[1] $CMPOP{ $_[2] } $_[3]" } ], [#Rule 138 'expr', 3, sub -#line 370 "Parser.yp" +#line 366 "Parser.yp" { "$_[1] . $_[3]" } ], [#Rule 139 'expr', 3, sub -#line 371 "Parser.yp" +#line 367 "Parser.yp" { "$_[1] && $_[3]" } ], [#Rule 140 'expr', 3, sub -#line 372 "Parser.yp" +#line 368 "Parser.yp" { "$_[1] || $_[3]" } ], [#Rule 141 'expr', 2, sub -#line 373 "Parser.yp" +#line 369 "Parser.yp" { "! $_[2]" } ], [#Rule 142 'expr', 5, sub -#line 374 "Parser.yp" +#line 370 "Parser.yp" { "$_[1] ? $_[3] : $_[5]" } ], [#Rule 143 'expr', 3, sub -#line 375 "Parser.yp" +#line 371 "Parser.yp" { $factory->assign(@{$_[2]}) } ], [#Rule 144 'expr', 3, sub -#line 376 "Parser.yp" +#line 372 "Parser.yp" { "($_[2])" } ], [#Rule 145 @@ -5931,7 +5932,7 @@ [#Rule 146 'setlist', 2, sub -#line 380 "Parser.yp" +#line 376 "Parser.yp" { push(@{$_[1]}, @{$_[2]}); $_[1] } ], [#Rule 147 @@ -5943,50 +5944,50 @@ [#Rule 149 'assign', 3, sub -#line 386 "Parser.yp" +#line 382 "Parser.yp" { [ $_[1], $_[3] ] } ], [#Rule 150 'assign', 3, sub -#line 387 "Parser.yp" +#line 383 "Parser.yp" { [ @_[1,3] ] } ], [#Rule 151 'args', 2, sub -#line 394 "Parser.yp" +#line 390 "Parser.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 152 'args', 2, sub -#line 395 "Parser.yp" +#line 391 "Parser.yp" { push(@{$_[1]->[0]}, $_[2]); $_[1] } ], [#Rule 153 'args', 4, sub -#line 396 "Parser.yp" +#line 392 "Parser.yp" { push(@{$_[1]->[0]}, "'', " . $factory->assign(@_[2,4])); $_[1] } ], [#Rule 154 'args', 2, sub -#line 398 "Parser.yp" +#line 394 "Parser.yp" { $_[1] } ], [#Rule 155 'args', 0, sub -#line 399 "Parser.yp" +#line 395 "Parser.yp" { [ [ ] ] } ], [#Rule 156 'lnameargs', 3, sub -#line 409 "Parser.yp" +#line 405 "Parser.yp" { push(@{$_[3]}, $_[1]); $_[3] } ], [#Rule 157 @@ -5998,7 +5999,7 @@ [#Rule 159 'lvalue', 3, sub -#line 414 "Parser.yp" +#line 410 "Parser.yp" { $factory->quoted($_[2]) } ], [#Rule 160 @@ -6007,43 +6008,43 @@ [#Rule 161 'nameargs', 3, sub -#line 418 "Parser.yp" +#line 414 "Parser.yp" { [ [$factory->ident($_[2])], $_[3] ] } ], [#Rule 162 'nameargs', 2, sub -#line 419 "Parser.yp" +#line 415 "Parser.yp" { [ @_[1,2] ] } ], [#Rule 163 'nameargs', 4, sub -#line 420 "Parser.yp" +#line 416 "Parser.yp" { [ @_[1,3] ] } ], [#Rule 164 'names', 3, sub -#line 423 "Parser.yp" +#line 419 "Parser.yp" { push(@{$_[1]}, $_[3]); $_[1] } ], [#Rule 165 'names', 1, sub -#line 424 "Parser.yp" +#line 420 "Parser.yp" { [ $_[1] ] } ], [#Rule 166 'name', 3, sub -#line 427 "Parser.yp" +#line 423 "Parser.yp" { $factory->quoted($_[2]) } ], [#Rule 167 'name', 1, sub -#line 428 "Parser.yp" +#line 424 "Parser.yp" { "'$_[1]'" } ], [#Rule 168 @@ -6052,7 +6053,7 @@ [#Rule 169 'filename', 3, sub -#line 440 "Parser.yp" +#line 436 "Parser.yp" { "$_[1].$_[3]" } ], [#Rule 170 @@ -6070,32 +6071,32 @@ [#Rule 174 'quoted', 2, sub -#line 454 "Parser.yp" +#line 450 "Parser.yp" { push(@{$_[1]}, $_[2]) if defined $_[2]; $_[1] } ], [#Rule 175 'quoted', 0, sub -#line 456 "Parser.yp" +#line 452 "Parser.yp" { [ ] } ], [#Rule 176 'quotable', 1, sub -#line 459 "Parser.yp" +#line 455 "Parser.yp" { $factory->ident($_[1]) } ], [#Rule 177 'quotable', 1, sub -#line 460 "Parser.yp" +#line 456 "Parser.yp" { $factory->text($_[1]) } ], [#Rule 178 'quotable', 1, sub -#line 461 "Parser.yp" +#line 457 "Parser.yp" { undef } ] ]; From cvs@template-toolkit.org Fri Jul 19 14:32:51 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXsI-000IFV-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:32:50 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:32:50 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/src/Release Changes.tt2 Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:32:50 Modified: docsrc/src/Release Changes.tt2 Log: * documented latest changes Revision Changes Path 1.58 +19 -3 Template2/docsrc/src/Release/Changes.tt2 Index: Changes.tt2 =================================================================== RCS file: /template-toolkit/Template2/docsrc/src/Release/Changes.tt2,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- Changes.tt2 2002/07/09 14:42:41 1.57 +++ Changes.tt2 2002/07/19 13:32:50 1.58 @@ -20,7 +20,7 @@ # Any changes you make here may be lost! # #------------------------------------------------------------------------ -# $Id: Changes.tt2,v 1.57 2002/07/09 14:42:41 abw Exp $ +# $Id: Changes.tt2,v 1.58 2002/07/19 13:32:50 abw Exp $ #======================================================================== #------------------------------------------------------------------------ @@ -39,9 +39,25 @@ the namespace prefix intact on the ident list which then gets passed to the handler's ident() method. Modified the ident() method of Template::Namespace::Constants to expect and remove it. + Constant folding now *doesn't* happen for constants that return + a reference or undefined value. These get compiled as regular + runtime variable lookups. -* Added the 'unique' list virtual method to cull multiple identical - items from a list (darren) +* Added new list virtual methods: 'unique' to cull multiple identical + items, 'merge' to merge lists together, 'splice' which acts + just like Perl's splice, and 'slice' which returns a slice of the + list. Also modified first and last virtual methods to take an + argument indicating the number of items to return from the start or + end of the list. Added the 'chunk' scalar virtual method to split a + string into chunks of a particular flushed either left or right. + (darren, mark, abw) + +* Modifed Template::Test to allow -- name testname -- comments to + be added to tests to give them names, reported by test harness + (darren) + +* Merged functionality of process() and include() methods into + process() with optional third $localize flag. (darren) * Modified the OUTPUT option to accept a reference to a list (darren) From cvs@template-toolkit.org Fri Jul 19 14:33:48 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXtD-000IHA-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:33:47 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:33:47 +0100 Subject: [Templates-cvs] cvs commit: Template2 MANIFEST Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:33:47 Modified: . MANIFEST Log: * added t/blocks.t to the MANIFEST * documented changes to virtual methods Revision Changes Path 2.29 +1 -0 Template2/MANIFEST Index: MANIFEST =================================================================== RCS file: /template-toolkit/Template2/MANIFEST,v retrieving revision 2.28 retrieving revision 2.29 diff -u -r2.28 -r2.29 --- MANIFEST 2002/07/08 18:50:46 2.28 +++ MANIFEST 2002/07/19 13:33:47 2.29 @@ -454,6 +454,7 @@ t/base.t t/binop.t t/block.t +t/blocks.t t/capture.t t/case.t t/cgi.t From cvs@template-toolkit.org Fri Jul 19 14:33:49 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VXtE-000IHM-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 14:33:48 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 14:33:48 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/src/Manual Variables.tt2 Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 13:33:48 Modified: docsrc/src/Manual Variables.tt2 Log: * added t/blocks.t to the MANIFEST * documented changes to virtual methods Revision Changes Path 1.12 +73 -14 Template2/docsrc/src/Manual/Variables.tt2 Index: Variables.tt2 =================================================================== RCS file: /template-toolkit/Template2/docsrc/src/Manual/Variables.tt2,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Variables.tt2 2002/07/19 03:59:52 1.11 +++ Variables.tt2 2002/07/19 13:33:48 1.12 @@ -544,23 +544,30 @@ Always returns 1 for scalar values. This method is provided for consistency with the hash and list size methods. -=item commify +=item chunk(size) -Applies the commify function from perlfaq5 ("How can I output my -numbers with commas added?"), with optionally configurable separators -(default to ",") and an optionally configurable number of grouped -numbers (defaults to 3). - - [% big_number = 1234567890 %] - [% big_number.commify %] - [% big_number.commify(".") %] - [% big_number.commify(",", 4) %] - 1,234,567,890 - 1.234.567.890 - 12,3456,7890 +Splits the value into a list of chunks of a certain size. -Usually, commify without options does The Right Thing. + [% ccard_no = "1234567824683579"; + ccard_no.chunk(4).join + %] + +Output: + + 1234 5678 2468 3579 + +If the size is specified as a negative number then the text will +be chunked from right-to-left. This gives the correct grouping +for numbers, for example. + + [% number = 1234567; + number.chunk(-3).join(',') + %] +Output: + + 1,234,567 + =back The following can be called against hash references. @@ -739,6 +746,58 @@ %] The original lists are not modified. + +=item slice(from, to) + +Returns a slice of items in the list between the bound passed as +arguments. If the second argument, 'to', isn't specified, then it +defaults to the last item in the list. + + [% first_three = list.slice(0,2) %] + + [% last_three = list.slice(-3, -1) %] + +=item splice(offset, length, list) + +Behaves just like Perl's splice() function allowing you to selectively +remove and/or replace elements in a list. It removes 'length' items +from the list, starting at 'offset' and replaces them with the items +in 'list'. + + [% play_game = [ 'play', 'scrabble' ]; + ping_pong = [ 'ping', 'pong' ]; + redundant = play_game.splice(1, 1, ping_pong); + + redundant.join; # scrabble + play_game.join; # play ping pong + %] + +The method returns a list of the items removed by the splice. +You can use the CALL directive to ignore the output if you're +not planning to do anything with it. + + [% CALL play_game.splice(1, 1, ping_pong) %] + +As well as providing a reference to a list of replacement values, +you can pass in a list of items. + + [% CALL list.splice(-1, 0, 'foo', 'bar') %] + +Be careful about passing just one item in as a replacement value. +If it is a reference to a list then the contents of the list will +be used. If it's not a list, then it will be treated as a single +value. You can use square brackets around a single item if you +need to be explicit: + + [% # push a single item, an_item + CALL list.splice(-1, 0, an_item); + + # push the items from another_list + CALL list.splice(-1, 0, another_list); + + # push a reference to another_list + CALL list.splice(-1, 0, [ another_list ]); + %] =back From cvs@template-toolkit.org Fri Jul 19 15:18:26 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYaQ-000J5Z-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:18:26 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:18:26 +0100 Subject: [Templates-cvs] cvs commit: Template2/t vmeth.t Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:18:26 Modified: t vmeth.t Log: added blib paths Revision Changes Path 2.17 +2 -2 Template2/t/vmeth.t Index: vmeth.t =================================================================== RCS file: /template-toolkit/Template2/t/vmeth.t,v retrieving revision 2.16 retrieving revision 2.17 diff -u -r2.16 -r2.17 --- vmeth.t 2002/07/19 13:13:06 2.16 +++ vmeth.t 2002/07/19 14:18:25 2.17 @@ -13,12 +13,12 @@ # This is free software; you can redistribute it and/or modify it # under the same terms as Perl itself. # -# $Id: vmeth.t,v 2.16 2002/07/19 13:13:06 abw Exp $ +# $Id: vmeth.t,v 2.17 2002/07/19 14:18:25 abw Exp $ # #======================================================================== use strict; -use lib qw( ./lib ../lib ); +use lib qw( ./lib ../lib ./blib/lib ../blib/lib ./blib/arch ../blib/arch ); use Template::Test; use Template::Constants qw( :status ); $^W = 1; From cvs@template-toolkit.org Fri Jul 19 15:38:15 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYtb-000JFU-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:38:15 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:38:15 +0100 Subject: [Templates-cvs] cvs commit: Template2/docsrc/src/Manual VMethods.tt2 Variables.tt2 Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:38:15 Modified: docsrc/src/Manual Variables.tt2 Added: docsrc/src/Manual VMethods.tt2 Log: * moved vmethods into a separate manual page Revision Changes Path 1.13 +0 -478 Template2/docsrc/src/Manual/Variables.tt2 Index: Variables.tt2 =================================================================== RCS file: /template-toolkit/Template2/docsrc/src/Manual/Variables.tt2,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Variables.tt2 2002/07/19 13:33:48 1.12 +++ Variables.tt2 2002/07/19 14:38:14 1.13 @@ -439,484 +439,6 @@ }; -=head2 Virtual Variable Methods - -The Template Toolkit provides virtual methods for manipulating -variable values. Most of them are analogous to regular Perl functions -of the same names. - -The following methods can be called against any scalar value: - -=over 4 - -=item defined - -Returns true if the value is defined. - - [% user = get_user(uid) IF uid.defined %] - -=item length - -Returns the length of the string representation of the item: - - [% IF password.length < 8 %] - Password too short, dumbass! - [% END %] - -=item repeat(n) - -Repeat the string a specified number of times. - - [% name = 'foo' %] - [% name.repeat(3) %] # foofoofoo - -=item replace(search, replace) - -Outputs the string with all instances of the first argument (specified -as a Perl regular expression) with the second. - - [% name = 'foo, bar & baz' %] - [% name.replace('\W+', '_') %] # foo_bar_baz - -=item match(pattern) - -Performs a regular expression match on the string using the pattern -passed as an argument. If the pattern matches the string then the -method returns a reference to a list of any strings captured within -parenthesis in the pattern. - - [% name = 'Larry Wall' %] - [% matches = name.match('(\w+) (\w+)') %] - [% matches.1 %], [% matches.0 %] # Wall, Larry - -If the pattern does not match then the method returns false, rather -than returning an empty list which Perl and the Template Toolkit both -consider to be a true value. This allows you to write expression like -this. - - [% "We're not worthy!" IF name.match('Larry Wall') %] - - [% IF (matches = name.match('(\w+) (\w+)')) %] - pattern matches: [% matches.join(', ') %] - [% ELSE %] - pattern does not match - [% END %] - -=item search(pattern) - -Performs a similar function to 'match' but simply returns true if the -string matches the regular expression pattern passed as an argument. - - [% name = 'foo bar baz' %] - [% name.search('bar') ? 'bar' : 'no bar' %] # bar - -This virtual method is now deprecated in favour of 'match'. Move along -now, there's nothing more to see here. - -=item split(pattern) - -Calls Perl's split() function to split a string into a list of -strings. - - [% FOREACH dir = mypath.split(':') %] - [% dir %] - [% END %] - -=item list - -Return the value as a single element list. This can be useful if you -have a variable which may contain a single item or a list and you want -to treat them equally. The 'list' method can be called against a list -reference and will simply return the original reference, effectively -a no-op. - - [% thing.list.size %] # thing can be a scalar or a list - -=item hash - -Return the value as a hash reference containing a single entry with -the key 'value' indicating the original scalar value. As with the -'hash' virtual method, this is generally used to help massage data -into different formats. - -=item size - -Always returns 1 for scalar values. This method is provided for -consistency with the hash and list size methods. - -=item chunk(size) - -Splits the value into a list of chunks of a certain size. - - [% ccard_no = "1234567824683579"; - ccard_no.chunk(4).join - %] - -Output: - - 1234 5678 2468 3579 - -If the size is specified as a negative number then the text will -be chunked from right-to-left. This gives the correct grouping -for numbers, for example. - - [% number = 1234567; - number.chunk(-3).join(',') - %] - -Output: - - 1,234,567 - -=back - -The following can be called against hash references. - -=over 4 - -=item keys, values, each - -The regular hash operators returning lists of keys, values or both. -Note how we use a '$' prefix on the 'key' variable in this example to -have it interpolated (i.e. replaced with its value) before use. - - [% FOREACH key = product.keys %] - [% key %] => [% product.$key %] - [% END %] - -=item sort, nsort - -Return a list of the keys, sorted alphabetically (sort) or numerically -(nsort) according to the corresponding values in the hash. - - [% FOREACH n = phones.sort %] - [% phones.$n %] is [% n %], - [% END %] - -=item import - -The import method can be called on a hash array to import the contents -of another hash array. - - [% hash1 = { - foo => 'Foo', - bar => 'Bar', - } - hash2 = { - wiz => 'Wiz', - woz => 'Woz', - } - %] - - [% hash1.import(hash2) %] - [% hash1.wiz %] # Wiz - -You can also call the import() method by itself to import a hash array -into the current namespace hash. - - [% user = { id => 'lwall', name => 'Larry Wall' } %] - [% import(user) %] - [% id %]: [% name %] # lwall: Larry Wall - -=item defined, exists - -Returns a true or false value if an item in the hash denoted by the key -passed as an argument is defined or exists, respectively. - - [% hash.defined('somekey') ? 'yes' : 'no' %] - [% hash.exists('somekey') ? 'yes' : 'no' %] - -=item size - -Returns the number of key =E value pairs in the hash. - -=item item - -Returns an item from the hash using a key passed as an argument. - - [% hash.item('foo') %] # same as hash.foo - -=item list - -Returns the contents of the hash in list form. An argument can be -passed to indicate the desired items required in the list: 'keys' to -return a list of the keys (same as hash.keys), 'values' to return a -list of the values (same as hash.values), or 'each' to return as list -of (key, value) pairs (same as hash.each). When called without an -argument it returns a list of hash references each containing a 'key' -and 'value' item representing - -=back - -The following virtual methods are provided for lists: - -=over 4 - -=item first, last - -Returns the first/last item in the list. The item is not removed from the -list. - - [% results.first %] to [% results.last %] - -=item size, max - -Returns the size of a list (number of elements) and the maximum -index number (size - 1), respectively. - - [% results.size %] search results matched your query - -=item reverse - -Returns the items of the list in reverse order. - - [% FOREACH s = scores.reverse %] - ... - [% END %] - -=item join - -Joins the items in the list into a single string, using Perl's join -function. - - [% items.join(', ') %] - -=item grep - -Returns a list of the items in the list that match a regular expression -pattern. - - [% FOREACH directory.files.grep('\.txt$') %] - ... - [% END %] - -=item sort, nsort - -Returns the items in alpha (sort) or numerical (nsort) order. - - [% library = books.sort %] - -An argument can be provided to specify a search key. Where an item in -the list is a hash reference, the search key will be used to retrieve a -value from the hash which will then be used as the comparison value. -Where an item is an object which implements a method of that name, the -method will be called to return a comparison value. - - [% library = books.sort('author') %] - -In the example, the 'books' list can contains hash references with -an 'author' key or objects with an 'author' method. - -=item unshift(item), push(item) - -Adds an item to the start/end of a list. - - [% mylist.unshift('prev item') %] - [% mylist.push('next item') %] - -=item shift, pop - -Removes the first/last item from the list and returns it. - - [% first = mylist.shift %] - [% last = mylist.pop %] - -=item unique - -Returns a list of the unique elements in a list, in the same order -as in the list itself. - - [% mylist = [ 1, 2, 3, 2, 3, 4, 1, 4, 3, 4, 5 ] %] - [% numbers = mylist.unique %] - -While this can be explicitly sorted, it is not required that the list -be sorted before the unique elements pulled out (unlike the Unix -command line utility). - - [% numbers = mylist.unique.sort %] - -=item merge - -Returns a list composed of zero or more other lists: - - [% list_one = [ 1 2 3 ]; - list_two = [ 4 5 6 ]; - list_three = [ 7 8 9 ]; - list_four = list_one.merge(list_two, list_three); - %] - -The original lists are not modified. - -=item slice(from, to) - -Returns a slice of items in the list between the bound passed as -arguments. If the second argument, 'to', isn't specified, then it -defaults to the last item in the list. - - [% first_three = list.slice(0,2) %] - - [% last_three = list.slice(-3, -1) %] - -=item splice(offset, length, list) - -Behaves just like Perl's splice() function allowing you to selectively -remove and/or replace elements in a list. It removes 'length' items -from the list, starting at 'offset' and replaces them with the items -in 'list'. - - [% play_game = [ 'play', 'scrabble' ]; - ping_pong = [ 'ping', 'pong' ]; - redundant = play_game.splice(1, 1, ping_pong); - - redundant.join; # scrabble - play_game.join; # play ping pong - %] - -The method returns a list of the items removed by the splice. -You can use the CALL directive to ignore the output if you're -not planning to do anything with it. - - [% CALL play_game.splice(1, 1, ping_pong) %] - -As well as providing a reference to a list of replacement values, -you can pass in a list of items. - - [% CALL list.splice(-1, 0, 'foo', 'bar') %] - -Be careful about passing just one item in as a replacement value. -If it is a reference to a list then the contents of the list will -be used. If it's not a list, then it will be treated as a single -value. You can use square brackets around a single item if you -need to be explicit: - - [% # push a single item, an_item - CALL list.splice(-1, 0, an_item); - - # push the items from another_list - CALL list.splice(-1, 0, another_list); - - # push a reference to another_list - CALL list.splice(-1, 0, [ another_list ]); - %] - -=back - -The following example demonstrates how an empty list ('folk') can be -populated with formatted strings by using the push() method in conjunction -with a FOREACH loop. The resultant list can then be printed using join. - - [% # define some initial data - people => [ - { id => 'tom', name => 'Tom' }, - { id => 'dick', name => 'Richard' }, - { id => 'larry', name => 'Larry' }, - ] - - # define an empty list that list methods can be called against - folk = [] - -%] - - [% folk.push("$person.name") - FOREACH person = people.sort('name') -%] - [% folk.join(",\n") %] - -Output: - - Larry, - Richard, - Tom - -You can define your own virtual methods for scalars, lists and hash -arrays. The Template::Stash package variables $SCALAR_OPS, $LIST_OPS -and $HASH_OPS are references to hash arrays that define these virtual -methods. HASH_OPS and LIST_OPS methods are subroutines that accept a -hash/list reference as the first item. SCALAR_OPS are subroutines -that accept a scalar value as the first item. Any other arguments -specified when the method is called will be passed to the subroutine. - - # load Template::Stash to make method tables visible - use Template::Stash; - - # define list method to return new list of odd numbers only - $Template::Stash::LIST_OPS->{ odd } = sub { - my $list = shift; - return [ grep { $_ % 2 } @$list ]; - }; - -template: - - [% primes = [ 2, 3, 5, 7, 9 ] %] - [% primes.odd.join(', ') %] # 3, 5, 7, 9 - -See also the examples in the t/vmeth.t test script. - -=head2 Automagic Promotion of Scalar to List - -In addition to the scalar virtual methods listed in the previous -section, you can also call any list virtual method against a scalar. -The item will be automagically promoted to a single element list and -the appropriate list virtual method will be called. - -One particular benefit of this comes when calling subroutines or -object methods that return a list of items, rather than the -preferred reference to a list of items. In this case, the -Template Toolkit automatically folds the items returned into -a list. - -The upshot is that you can continue to use existing Perl modules or -code that returns lists of items, without having to refactor it -just to keep the Template Toolkit happy (by returning references -to list). Class::DBI module is just one example of a particularly -useful module which returns values this way. - -If only a single item is returned from a subroutine then the -Template Toolkit assumes it meant to return a single item (rather -than a list of 1 item) and leaves it well alone, returning the -single value as it is. If you're executing a database query, -for example, you might get 1 item returned, or perhaps many -items which are then folded into a list. - -The FOREACH directive will happily accept either a list or a single -item which it will treat as a list. So it's safe to write directives -like this, where we assume that 'something' is bound to a subroutine -which might return 1 or more items: - - [% FOREACH item = something %] - ... - [% END %] - -The automagic promotion of scalars to single item lists means -that you can also use list virtual methods safely, even if you -only get one item returned. For example: - - [% something.first %] - [% something.join %] - [% something.reverse.join(', ') %] - -Note that this is very much a last-ditch behaviour. If the single -item return is an object with a 'first' method, for example, then that -will be called, as expected, in preference to the list virtual method. - -=head2 Compound Variables - -Compound 'dotted' variables may contain any number of separate -elements. Each element may evaluate to any of the permitted variable -types and the processor will then correctly use this value to evaluate -the rest of the variable. Arguments may be passed to any of the -intermediate elements. - - [% myorg.people.sort('surname').first.fullname %] - -Intermediate variables may be used and will behave entirely as expected. - - [% sorted = myorg.people.sort('surname') %] - [% sorted.first.fullname %] - -This simplified dotted notation has the benefit of hiding the -implementation details of your data. For example, you could implement -a data structure as a hash array one day and then change it to an -object the next without requiring any change to the templates. - =head2 Variable Interpolation The Template Toolkit uses '$' consistently to indicate that a variable 1.1 Template2/docsrc/src/Manual/VMethods.tt2 Index: VMethods.tt2 =================================================================== [% TAGS star -%] =head1 DESCRIPTION [* USE wrap; page.intro | wrap(72) *] =head2 Scalar Virtual Methods =over 4 =item defined Returns true if the value is defined. [% user = get_user(uid) IF uid.defined %] =item length Returns the length of the string representation of the item: [% IF password.length < 8 %] Password too short, dumbass! [% END %] =item repeat(n) Repeat the string a specified number of times. [% name = 'foo' %] [% name.repeat(3) %] # foofoofoo =item replace(search, replace) Outputs the string with all instances of the first argument (specified as a Perl regular expression) with the second. [% name = 'foo, bar & baz' %] [% name.replace('\W+', '_') %] # foo_bar_baz =item match(pattern) Performs a regular expression match on the string using the pattern passed as an argument. If the pattern matches the string then the method returns a reference to a list of any strings captured within parenthesis in the pattern. [% name = 'Larry Wall' %] [% matches = name.match('(\w+) (\w+)') %] [% matches.1 %], [% matches.0 %] # Wall, Larry If the pattern does not match then the method returns false, rather than returning an empty list which Perl and the Template Toolkit both consider to be a true value. This allows you to write expression like this. [% "We're not worthy!" IF name.match('Larry Wall') %] [% IF (matches = name.match('(\w+) (\w+)')) %] pattern matches: [% matches.join(', ') %] [% ELSE %] pattern does not match [% END %] =item search(pattern) Performs a similar function to 'match' but simply returns true if the string matches the regular expression pattern passed as an argument. [% name = 'foo bar baz' %] [% name.search('bar') ? 'bar' : 'no bar' %] # bar This virtual method is now deprecated in favour of 'match'. Move along now, there's nothing more to see here. =item split(pattern) Calls Perl's split() function to split a string into a list of strings. [% FOREACH dir = mypath.split(':') %] [% dir %] [% END %] =item chunk(size) Splits the value into a list of chunks of a certain size. [% ccard_no = "1234567824683579"; ccard_no.chunk(4).join %] Output: 1234 5678 2468 3579 If the size is specified as a negative number then the text will be chunked from right-to-left. This gives the correct grouping for numbers, for example. [% number = 1234567; number.chunk(-3).join(',') %] Output: 1,234,567 =item list Return the value as a single element list. This can be useful if you have a variable which may contain a single item or a list and you want to treat them equally. The 'list' method can be called against a list reference and will simply return the original reference, effectively a no-op. [% thing.list.size %] # thing can be a scalar or a list =item hash Return the value as a hash reference containing a single entry with the key 'value' indicating the original scalar value. As with the 'hash' virtual method, this is generally used to help massage data into different formats. =item size Always returns 1 for scalar values. This method is provided for consistency with the hash and list size methods. =back =head2 Hash Virtual Methods =over 4 =item keys, values, each The regular hash operators returning lists of keys, values or both. Note how we use a '$' prefix on the 'key' variable in this example to have it interpolated (i.e. replaced with its value) before use. [% FOREACH key = product.keys %] [% key %] => [% product.$key %] [% END %] =item sort, nsort Return a list of the keys, sorted alphabetically (sort) or numerically (nsort) according to the corresponding values in the hash. [% FOREACH n = phones.sort %] [% phones.$n %] is [% n %], [% END %] =item import The import method can be called on a hash array to import the contents of another hash array. [% hash1 = { foo => 'Foo', bar => 'Bar', } hash2 = { wiz => 'Wiz', woz => 'Woz', } %] [% hash1.import(hash2) %] [% hash1.wiz %] # Wiz You can also call the import() method by itself to import a hash array into the current namespace hash. [% user = { id => 'lwall', name => 'Larry Wall' } %] [% import(user) %] [% id %]: [% name %] # lwall: Larry Wall =item defined, exists Returns a true or false value if an item in the hash denoted by the key passed as an argument is defined or exists, respectively. [% hash.defined('somekey') ? 'yes' : 'no' %] [% hash.exists('somekey') ? 'yes' : 'no' %] =item size Returns the number of key =E value pairs in the hash. =item item Returns an item from the hash using a key passed as an argument. [% hash.item('foo') %] # same as hash.foo =item list Returns the contents of the hash in list form. An argument can be passed to indicate the desired items required in the list: 'keys' to return a list of the keys (same as hash.keys), 'values' to return a list of the values (same as hash.values), or 'each' to return as list of (key, value) pairs (same as hash.each). When called without an argument it returns a list of hash references each containing a 'key' and 'value' item representing =back =head2 List Virtual Methods =over 4 =item first, last Returns the first/last item in the list. The item is not removed from the list. [% results.first %] to [% results.last %] =item size, max Returns the size of a list (number of elements) and the maximum index number (size - 1), respectively. [% results.size %] search results matched your query =item reverse Returns the items of the list in reverse order. [% FOREACH s = scores.reverse %] ... [% END %] =item join Joins the items in the list into a single string, using Perl's join function. [% items.join(', ') %] =item grep Returns a list of the items in the list that match a regular expression pattern. [% FOREACH directory.files.grep('\.txt$') %] ... [% END %] =item sort, nsort Returns the items in alpha (sort) or numerical (nsort) order. [% library = books.sort %] An argument can be provided to specify a search key. Where an item in the list is a hash reference, the search key will be used to retrieve a value from the hash which will then be used as the comparison value. Where an item is an object which implements a method of that name, the method will be called to return a comparison value. [% library = books.sort('author') %] In the example, the 'books' list can contains hash references with an 'author' key or objects with an 'author' method. =item unshift(item), push(item) Adds an item to the start/end of a list. [% mylist.unshift('prev item') %] [% mylist.push('next item') %] =item shift, pop Removes the first/last item from the list and returns it. [% first = mylist.shift %] [% last = mylist.pop %] =item unique Returns a list of the unique elements in a list, in the same order as in the list itself. [% mylist = [ 1, 2, 3, 2, 3, 4, 1, 4, 3, 4, 5 ] %] [% numbers = mylist.unique %] While this can be explicitly sorted, it is not required that the list be sorted before the unique elements pulled out (unlike the Unix command line utility). [% numbers = mylist.unique.sort %] =item merge Returns a list composed of zero or more other lists: [% list_one = [ 1 2 3 ]; list_two = [ 4 5 6 ]; list_three = [ 7 8 9 ]; list_four = list_one.merge(list_two, list_three); %] The original lists are not modified. =item slice(from, to) Returns a slice of items in the list between the bounds passed as arguments. If the second argument, 'to', isn't specified, then it defaults to the last item in the list. The original list is not modified. [% first_three = list.slice(0,2) %] [% last_three = list.slice(-3, -1) %] =item splice(offset, length, list) Behaves just like Perl's splice() function allowing you to selectively remove and/or replace elements in a list. It removes 'length' items from the list, starting at 'offset' and replaces them with the items in 'list'. [% play_game = [ 'play', 'scrabble' ]; ping_pong = [ 'ping', 'pong' ]; redundant = play_game.splice(1, 1, ping_pong); redundant.join; # scrabble play_game.join; # play ping pong %] The method returns a list of the items removed by the splice. You can use the CALL directive to ignore the output if you're not planning to do anything with it. [% CALL play_game.splice(1, 1, ping_pong) %] As well as providing a reference to a list of replacement values, you can pass in a list of items. [% CALL list.splice(-1, 0, 'foo', 'bar') %] Be careful about passing just one item in as a replacement value. If it is a reference to a list then the contents of the list will be used. If it's not a list, then it will be treated as a single value. You can use square brackets around a single item if you need to be explicit: [% # push a single item, an_item CALL list.splice(-1, 0, an_item); # push the items from another_list CALL list.splice(-1, 0, another_list); # push a reference to another_list CALL list.splice(-1, 0, [ another_list ]); %] =back The following example demonstrates how an empty list ('folk') can be populated with formatted strings by using the push() method in conjunction with a FOREACH loop. The resultant list can then be printed using join. [% # define some initial data people => [ { id => 'tom', name => 'Tom' }, { id => 'dick', name => 'Richard' }, { id => 'larry', name => 'Larry' }, ] # define an empty list that list methods can be called against folk = [] -%] [% folk.push("$person.name") FOREACH person = people.sort('name') -%] [% folk.join(",\n") %] Output: Larry, Richard, Tom You can define your own virtual methods for scalars, lists and hash arrays. The Template::Stash package variables $SCALAR_OPS, $LIST_OPS and $HASH_OPS are references to hash arrays that define these virtual methods. HASH_OPS and LIST_OPS methods are subroutines that accept a hash/list reference as the first item. SCALAR_OPS are subroutines that accept a scalar value as the first item. Any other arguments specified when the method is called will be passed to the subroutine. # load Template::Stash to make method tables visible use Template::Stash; # define list method to return new list of odd numbers only $Template::Stash::LIST_OPS->{ odd } = sub { my $list = shift; return [ grep { $_ % 2 } @$list ]; }; template: [% primes = [ 2, 3, 5, 7, 9 ] %] [% primes.odd.join(', ') %] # 3, 5, 7, 9 See also the examples in the t/vmeth.t test script. =head2 Automagic Promotion of Scalar to List for Virtual Methods In addition to the scalar virtual methods listed in the previous section, you can also call any list virtual method against a scalar. The item will be automagically promoted to a single element list and the appropriate list virtual method will be called. One particular benefit of this comes when calling subroutines or object methods that return a list of items, rather than the preferred reference to a list of items. In this case, the Template Toolkit automatically folds the items returned into a list. The upshot is that you can continue to use existing Perl modules or code that returns lists of items, without having to refactor it just to keep the Template Toolkit happy (by returning references to list). Class::DBI module is just one example of a particularly useful module which returns values this way. If only a single item is returned from a subroutine then the Template Toolkit assumes it meant to return a single item (rather than a list of 1 item) and leaves it well alone, returning the single value as it is. If you're executing a database query, for example, you might get 1 item returned, or perhaps many items which are then folded into a list. The FOREACH directive will happily accept either a list or a single item which it will treat as a list. So it's safe to write directives like this, where we assume that 'something' is bound to a subroutine which might return 1 or more items: [% FOREACH item = something %] ... [% END %] The automagic promotion of scalars to single item lists means that you can also use list virtual methods safely, even if you only get one item returned. For example: [% something.first %] [% something.join %] [% something.reverse.join(', ') %] Note that this is very much a last-ditch behaviour. If the single item return is an object with a 'first' method, for example, then that will be called, as expected, in preference to the list virtual method. =head2 Compound Variables Compound 'dotted' variables may contain any number of separate elements. Each element may evaluate to any of the permitted variable types and the processor will then correctly use this value to evaluate the rest of the variable. Arguments may be passed to any of the intermediate elements. [% myorg.people.sort('surname').first.fullname %] Intermediate variables may be used and will behave entirely as expected. [% sorted = myorg.people.sort('surname') %] [% sorted.first.fullname %] This simplified dotted notation has the benefit of hiding the implementation details of your data. For example, you could implement a data structure as a hash array one day and then change it to an object the next without requiring any change to the templates. From cvs@template-toolkit.org Fri Jul 19 15:43:06 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyI-000JJk-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:06 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:06 +0100 Subject: [Templates-cvs] cvs commit: Template2 Changes HACKING INSTALL MANIFEST README TODO Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:06 Modified: . Changes HACKING INSTALL MANIFEST README TODO Log: moved vmethods into separate manpage Revision Changes Path 2.66 +20 -4 Template2/Changes Index: Changes =================================================================== RCS file: /template-toolkit/Template2/Changes,v retrieving revision 2.65 retrieving revision 2.66 diff -u -r2.65 -r2.66 --- Changes 2002/07/09 14:41:41 2.65 +++ Changes 2002/07/19 14:42:59 2.66 @@ -19,11 +19,11 @@ # Any changes you make here may be lost! # #------------------------------------------------------------------------ -# $Id: Changes,v 2.65 2002/07/09 14:41:41 abw Exp $ +# $Id: Changes,v 2.66 2002/07/19 14:42:59 abw Exp $ #======================================================================== #------------------------------------------------------------------------ -# Version 2.07c - July 9th 2002 ## DEVELOPER RELEASE ## +# Version 2.07c - July 19th 2002 ## DEVELOPER RELEASE ## #------------------------------------------------------------------------ * Fixed a bug in Date plugin introduced in last version which caused @@ -38,9 +38,25 @@ the namespace prefix intact on the ident list which then gets passed to the handler's ident() method. Modified the ident() method of Template::Namespace::Constants to expect and remove it. + Constant folding now *doesn't* happen for constants that return + a reference or undefined value. These get compiled as regular + runtime variable lookups. -* Added the 'unique' list virtual method to cull multiple identical - items from a list (darren) +* Added new list virtual methods: 'unique' to cull multiple identical + items, 'merge' to merge lists together, 'splice' which acts + just like Perl's splice, and 'slice' which returns a slice of the + list. Also modified first and last virtual methods to take an + argument indicating the number of items to return from the start or + end of the list. Added the 'chunk' scalar virtual method to split a + string into chunks of a particular flushed either left or right. + (darren, mark, abw) + +* Modifed Template::Test to allow -- name testname -- comments to + be added to tests to give them names, reported by test harness + (darren) + +* Merged functionality of process() and include() methods into + process() with optional third $localize flag. (darren) * Modified the OUTPUT option to accept a reference to a list (darren) 2.20 +1 -1 Template2/HACKING Index: HACKING =================================================================== RCS file: /template-toolkit/Template2/HACKING,v retrieving revision 2.19 retrieving revision 2.20 diff -u -r2.19 -r2.20 --- HACKING 2002/07/09 14:41:41 2.19 +++ HACKING 2002/07/19 14:42:59 2.20 @@ -3,7 +3,7 @@ Version 2.07c - 09 July 2002 + 19 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. 2.21 +1 -1 Template2/INSTALL Index: INSTALL =================================================================== RCS file: /template-toolkit/Template2/INSTALL,v retrieving revision 2.20 retrieving revision 2.21 diff -u -r2.20 -r2.21 --- INSTALL 2002/07/09 14:41:41 2.20 +++ INSTALL 2002/07/19 14:42:59 2.21 @@ -3,7 +3,7 @@ Version 2.07c - 09 July 2002 + 19 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. 2.30 +2 -0 Template2/MANIFEST Index: MANIFEST =================================================================== RCS file: /template-toolkit/Template2/MANIFEST,v retrieving revision 2.29 retrieving revision 2.30 diff -u -r2.29 -r2.30 --- MANIFEST 2002/07/19 13:33:47 2.29 +++ MANIFEST 2002/07/19 14:43:05 2.30 @@ -39,6 +39,7 @@ docs/src/Manual/Plugins.html docs/src/Manual/Refs.html docs/src/Manual/Syntax.html +docs/src/Manual/VMethods.html docs/src/Manual/Variables.html docs/src/Manual/Views.html docs/src/Manual/index.html @@ -386,6 +387,7 @@ lib/Template/Manual/Plugins.pod lib/Template/Manual/Refs.pod lib/Template/Manual/Syntax.pod +lib/Template/Manual/VMethods.pod lib/Template/Manual/Variables.pod lib/Template/Manual/Views.pod lib/Template/Modules.pod 2.48 +1 -1 Template2/README Index: README =================================================================== RCS file: /template-toolkit/Template2/README,v retrieving revision 2.47 retrieving revision 2.48 diff -u -r2.47 -r2.48 --- README 2002/07/09 14:41:41 2.47 +++ README 2002/07/19 14:43:05 2.48 @@ -3,7 +3,7 @@ Version 2.07c - 09 July 2002 + 19 July 2002 Copyright (C) 1996-2002 Andy Wardley. All Rights Reserved Copyright (C) 1998-2002 Canon Research Centre Europe Ltd. 2.66 +1 -3 Template2/TODO Index: TODO =================================================================== RCS file: /template-toolkit/Template2/TODO,v retrieving revision 2.65 retrieving revision 2.66 diff -u -r2.65 -r2.66 --- TODO 2002/07/09 14:41:42 2.65 +++ TODO 2002/07/19 14:43:05 2.66 @@ -11,14 +11,12 @@ # Andy Wardley # #------------------------------------------------------------------------ -# $Id: TODO,v 2.65 2002/07/09 14:41:42 abw Exp $ +# $Id: TODO,v 2.66 2002/07/19 14:43:05 abw Exp $ #======================================================================== #------------------------------------------------------------------------ # Miscellaneous #------------------------------------------------------------------------ - -* mylist.sort.uniq * Errors thrown via the Error module are not correctly caught. I looked at this briefly but the problem wasn't immediately obvious and needs some From cvs@template-toolkit.org Fri Jul 19 15:43:08 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyJ-000JK0-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:07 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:07 +0100 Subject: [Templates-cvs] cvs commit: Template2/bin tpage ttree Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:07 Modified: bin tpage ttree Log: moved vmethods into separate manpage Revision Changes Path 2.49 +3 -3 Template2/bin/tpage Index: tpage =================================================================== RCS file: /template-toolkit/Template2/bin/tpage,v retrieving revision 2.48 retrieving revision 2.49 diff -u -r2.48 -r2.49 --- tpage 2002/07/09 14:41:43 2.48 +++ tpage 2002/07/19 14:43:07 2.49 @@ -19,7 +19,7 @@ # #------------------------------------------------------------------------ # -# $Id: tpage,v 2.48 2002/07/09 14:41:43 abw Exp $ +# $Id: tpage,v 2.49 2002/07/19 14:43:07 abw Exp $ # #======================================================================== @@ -112,8 +112,8 @@ =head1 VERSION -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002. =head1 COPYRIGHT 2.52 +4 -4 Template2/bin/ttree Index: ttree =================================================================== RCS file: /template-toolkit/Template2/bin/ttree,v retrieving revision 2.51 retrieving revision 2.52 diff -u -r2.51 -r2.52 --- ttree 2002/07/09 14:41:44 2.51 +++ ttree 2002/07/19 14:43:07 2.52 @@ -23,7 +23,7 @@ # #------------------------------------------------------------------------ # -# $Id: ttree,v 2.51 2002/07/09 14:41:44 abw Exp $ +# $Id: ttree,v 2.52 2002/07/19 14:43:07 abw Exp $ # #======================================================================== @@ -39,7 +39,7 @@ # config #------------------------------------------------------------------------ my $NAME = "ttree"; -my $VERSION = sprintf("%d.%02d", q$Revision: 2.51 $ =~ /(\d+)\.(\d+)/); +my $VERSION = sprintf("%d.%02d", q$Revision: 2.52 $ =~ /(\d+)\.(\d+)/); my $HOME = $ENV{ HOME } || ''; my $RCFILE = $ENV{"\U${NAME}rc"} || "$HOME/.${NAME}rc"; @@ -635,8 +635,8 @@ =head1 VERSION -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002. =head1 COPYRIGHT From cvs@template-toolkit.org Fri Jul 19 15:43:09 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyL-000JKC-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:09 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:09 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/lib/docset config Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:09 Modified: docs/lib/docset config Log: moved vmethods into separate manpage Revision Changes Path 1.11 +16 -2 Template2/docs/lib/docset/config Index: config =================================================================== RCS file: /template-toolkit/Template2/docs/lib/docset/config,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- config 2002/07/07 14:42:48 1.10 +++ config 2002/07/19 14:43:08 1.11 @@ -75,7 +75,7 @@ prev => 'Tutorial', next => 'Modules', - pagelist => [ 'Intro', 'Syntax', 'Variables', 'Directives', 'Config', 'Filters', 'Plugins', 'Internals', 'Views', 'Refs', 'Credits' ], + pagelist => [ 'Intro', 'Syntax', 'Variables', 'VMethods', 'Directives', 'Config', 'Filters', 'Plugins', 'Internals', 'Views', 'Refs', 'Credits' ], pages => { Intro => { @@ -115,6 +115,19 @@ about => 'Template variables and code bindings', prev => 'Syntax', + next => 'VMethods', + }, + VMethods => { + id => 'VMethods', + name => 'VMethods', + title => 'VMethods', + podname => 'Template::Manual::VMethods', + url => 'Manual/VMethods.html', + uplink => '..', + author => 'abw', + about => 'Virtual Methods', + + prev => 'Variables', next => 'Directives', }, Directives => { @@ -127,7 +140,7 @@ author => 'abw', about => 'Template directives', - prev => 'Variables', + prev => 'VMethods', next => 'Config', }, Config => { @@ -1294,6 +1307,7 @@ 'Template::Manual::Intro' => 'Manual/Intro.html', 'Template::Manual::Syntax' => 'Manual/Syntax.html', 'Template::Manual::Variables' => 'Manual/Variables.html', + 'Template::Manual::VMethods' => 'Manual/VMethods.html', 'Template::Manual::Directives' => 'Manual/Directives.html', 'Template::Manual::Config' => 'Manual/Config.html', 'Template::Manual::Filters' => 'Manual/Filters.html', From cvs@template-toolkit.org Fri Jul 19 15:43:23 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyZ-000JMj-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:23 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:23 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template Base.html Config.html Constants.html Context.html Document.html Exception.html Filters.html Iterator.html Parser.html Plugin.html Plugins.html Provider.html Service.html Stash.html Test.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:23 Modified: docs/src/Modules/Template Base.html Config.html Constants.html Context.html Document.html Exception.html Filters.html Iterator.html Parser.html Plugin.html Plugins.html Provider.html Service.html Stash.html Test.html Log: moved vmethods into separate manpage Revision Changes Path 1.47 +2 -2 Template2/docs/src/Modules/Template/Base.html Index: Base.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Base.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Base.html 2002/07/09 14:41:55 1.46 +++ Base.html 2002/07/19 14:43:20 1.47 @@ -114,8 +114,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Config.html Index: Config.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Config.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Config.html 2002/07/09 14:41:56 1.46 +++ Config.html 2002/07/19 14:43:20 1.47 @@ -160,8 +160,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Constants.html Index: Constants.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Constants.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Constants.html 2002/07/09 14:41:56 1.46 +++ Constants.html 2002/07/19 14:43:20 1.47 @@ -103,8 +103,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Context.html Index: Context.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Context.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Context.html 2002/07/09 14:41:56 1.46 +++ Context.html 2002/07/19 14:43:20 1.47 @@ -632,8 +632,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.63, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.66, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Document.html Index: Document.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Document.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Document.html 2002/07/09 14:41:56 1.46 +++ Document.html 2002/07/19 14:43:20 1.47 @@ -212,8 +212,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.53, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.54, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Exception.html Index: Exception.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Exception.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Exception.html 2002/07/09 14:41:56 1.46 +++ Exception.html 2002/07/19 14:43:20 1.47 @@ -91,8 +91,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Filters.html Index: Filters.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Filters.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Filters.html 2002/07/09 14:41:56 1.46 +++ Filters.html 2002/07/19 14:43:21 1.47 @@ -703,8 +703,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.56, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.57, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Iterator.html Index: Iterator.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Iterator.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Iterator.html 2002/07/09 14:41:56 1.46 +++ Iterator.html 2002/07/19 14:43:21 1.47 @@ -241,8 +241,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.50, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Parser.html Index: Parser.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Parser.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Parser.html 2002/07/09 14:41:57 1.46 +++ Parser.html 2002/07/19 14:43:21 1.47 @@ -452,8 +452,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.63, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.64, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

     
    [%- END %] 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin.html Index: Plugin.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Plugin.html 2002/07/09 14:41:57 1.46 +++ Plugin.html 2002/07/19 14:43:21 1.47 @@ -242,8 +242,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.51, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.52, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugins.html Index: Plugins.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugins.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Plugins.html 2002/07/09 14:41:57 1.46 +++ Plugins.html 2002/07/19 14:43:21 1.47 @@ -779,8 +779,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.55, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.56, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Provider.html Index: Provider.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Provider.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Provider.html 2002/07/09 14:41:57 1.46 +++ Provider.html 2002/07/19 14:43:21 1.47 @@ -441,8 +441,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.58, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.60, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Service.html Index: Service.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Service.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Service.html 2002/07/09 14:41:57 1.46 +++ Service.html 2002/07/19 14:43:21 1.47 @@ -443,8 +443,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.58, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.60, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Stash.html Index: Stash.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Stash.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Stash.html 2002/07/09 14:41:57 1.46 +++ Stash.html 2002/07/19 14:43:21 1.47 @@ -182,8 +182,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.63, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.66, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Test.html Index: Test.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Test.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Test.html 2002/07/09 14:41:57 1.46 +++ Test.html 2002/07/19 14:43:22 1.47 @@ -296,8 +296,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.54, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Fri Jul 19 15:43:10 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyM-000JKP-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:10 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:10 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/FAQ FAQ.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:10 Modified: docs/src/FAQ FAQ.html Log: moved vmethods into separate manpage Revision Changes Path 1.48 +2 -2 Template2/docs/src/FAQ/FAQ.html Index: FAQ.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/FAQ/FAQ.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- FAQ.html 2002/07/09 14:41:45 1.47 +++ FAQ.html 2002/07/19 14:43:10 1.48 @@ -319,8 +319,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Fri Jul 19 15:43:12 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyN-000JKh-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:11 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:11 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Library HTML.html PostScript.html Splash.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:11 Modified: docs/src/Library HTML.html PostScript.html Splash.html Log: moved vmethods into separate manpage Revision Changes Path 1.47 +2 -2 Template2/docs/src/Library/HTML.html Index: HTML.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Library/HTML.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- HTML.html 2002/07/09 14:41:46 1.46 +++ HTML.html 2002/07/19 14:43:10 1.47 @@ -292,8 +292,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Library/PostScript.html Index: PostScript.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Library/PostScript.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- PostScript.html 2002/07/09 14:41:46 1.46 +++ PostScript.html 2002/07/19 14:43:11 1.47 @@ -47,8 +47,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Library/Splash.html Index: Splash.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Library/Splash.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Splash.html 2002/07/09 14:41:46 1.46 +++ Splash.html 2002/07/19 14:43:11 1.47 @@ -892,8 +892,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Fri Jul 19 15:43:18 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyU-000JLf-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:18 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:18 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Manual VMethods.html Config.html Credits.html Directives.html Filters.html Internals.html Intro.html Plugins.html Refs.html Syntax.html Variables.html Views.html index.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:18 Modified: docs/src/Manual Config.html Credits.html Directives.html Filters.html Internals.html Intro.html Plugins.html Refs.html Syntax.html Variables.html Views.html index.html Added: docs/src/Manual VMethods.html Log: moved vmethods into separate manpage Revision Changes Path 1.35 +1 -1 Template2/docs/src/Manual/Config.html Index: Config.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Config.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Config.html 2002/07/09 14:41:48 1.34 +++ Config.html 2002/07/19 14:43:12 1.35 @@ -1720,7 +1720,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.35 +1 -1 Template2/docs/src/Manual/Credits.html Index: Credits.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Credits.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Credits.html 2002/07/09 14:41:49 1.34 +++ Credits.html 2002/07/19 14:43:13 1.35 @@ -156,7 +156,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.35 +1 -1 Template2/docs/src/Manual/Directives.html Index: Directives.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Directives.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Directives.html 2002/07/09 14:41:49 1.34 +++ Directives.html 2002/07/19 14:43:15 1.35 @@ -1972,7 +1972,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.34 +1 -1 Template2/docs/src/Manual/Filters.html Index: Filters.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Filters.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Filters.html 2002/07/09 14:41:51 1.33 +++ Filters.html 2002/07/19 14:43:15 1.34 @@ -513,7 +513,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.34 +1 -1 Template2/docs/src/Manual/Internals.html Index: Internals.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Internals.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Internals.html 2002/07/09 14:41:51 1.33 +++ Internals.html 2002/07/19 14:43:15 1.34 @@ -544,7 +544,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.34 +1 -1 Template2/docs/src/Manual/Intro.html Index: Intro.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Intro.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Intro.html 2002/07/09 14:41:51 1.33 +++ Intro.html 2002/07/19 14:43:15 1.34 @@ -267,7 +267,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.34 +1 -1 Template2/docs/src/Manual/Plugins.html Index: Plugins.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Plugins.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Plugins.html 2002/07/09 14:41:51 1.33 +++ Plugins.html 2002/07/19 14:43:15 1.34 @@ -567,7 +567,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.34 +1 -1 Template2/docs/src/Manual/Refs.html Index: Refs.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Refs.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Refs.html 2002/07/09 14:41:52 1.33 +++ Refs.html 2002/07/19 14:43:15 1.34 @@ -143,7 +143,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.34 +1 -1 Template2/docs/src/Manual/Syntax.html Index: Syntax.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Syntax.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Syntax.html 2002/07/09 14:41:52 1.33 +++ Syntax.html 2002/07/19 14:43:16 1.34 @@ -285,7 +285,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.34 +87 -1 Template2/docs/src/Manual/Variables.html Index: Variables.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Variables.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Variables.html 2002/07/09 14:41:52 1.33 +++ Variables.html 2002/07/19 14:43:16 1.34 @@ -564,6 +564,30 @@ [% tt_start_tag %] dir [% tt_end_tag %] [% tt_start_tag %] END [% tt_end_tag %] +
  • chunk(size)
    +

    +Splits the value into a list of chunks of a certain size. +

    +
        [% tt_start_tag %] ccard_no = "1234567824683579";
      +       ccard_no.chunk(4).join
      +    [% tt_end_tag %]
    +

    +Output: +

    +
        1234 5678 2468 3579
    +

    +If the size is specified as a negative number then the text will +be chunked from right-to-left. This gives the correct grouping +for numbers, for example. +

    +
        [% tt_start_tag %] number = 1234567;
      +       number.chunk(-3).join(',')
      +    [% tt_end_tag %]
    +

    +Output: +

    +
        1,234,567
    +
  • list

    Return the value as a single element list. This can be useful if you @@ -755,6 +779,68 @@

        [% tt_start_tag %] numbers = mylist.unique.sort [% tt_end_tag %]
    +
  • merge
    +

    +Returns a list composed of zero or more other lists: +

    +
        [% tt_start_tag %] list_one = [ 1 2 3 ];
      +       list_two = [ 4 5 6 ];
      +       list_three = [ 7 8 9 ];
      +       list_four = list_one.merge(list_two, list_three);
      +    [% tt_end_tag %]
    +

    +The original lists are not modified. +

    + +
  • slice(from, to)
    +

    +Returns a slice of items in the list between the bounds passed as +arguments. If the second argument, 'to', isn't specified, then it +defaults to the last item in the list. The original list is not +modified. +

    +
        [% tt_start_tag %] first_three = list.slice(0,2) [% tt_end_tag %]
    +
        [% tt_start_tag %] last_three  = list.slice(-3, -1) [% tt_end_tag %]
    + +
  • splice(offset, length, list)
    +

    +Behaves just like Perl's splice() function allowing you to selectively +remove and/or replace elements in a list. It removes 'length' items +from the list, starting at 'offset' and replaces them with the items +in 'list'. +

    +
       [% tt_start_tag %] play_game = [ 'play', 'scrabble' ];
      +      ping_pong = [ 'ping', 'pong' ];
      +      redundant = play_game.splice(1, 1, ping_pong);
    +
          redundant.join;     # scrabble
      +      play_game.join;     # play ping pong
      +   [% tt_end_tag %]
    +

    +The method returns a list of the items removed by the splice. +You can use the CALL directive to ignore the output if you're +not planning to do anything with it. +

    +
        [% tt_start_tag %] CALL play_game.splice(1, 1, ping_pong) [% tt_end_tag %]
    +

    +As well as providing a reference to a list of replacement values, +you can pass in a list of items. +

    +
       [% tt_start_tag %] CALL list.splice(-1, 0, 'foo', 'bar') [% tt_end_tag %]
    +

    +Be careful about passing just one item in as a replacement value. +If it is a reference to a list then the contents of the list will +be used. If it's not a list, then it will be treated as a single +value. You can use square brackets around a single item if you +need to be explicit: +

    +
      [% tt_start_tag %] # push a single item, an_item
      +     CALL list.splice(-1, 0, an_item);
    +
         # push the items from another_list
      +     CALL list.splice(-1, 0, another_list);
    +
         # push a reference to another_list
      +     CALL list.splice(-1, 0, [ another_list ]);
      +  [% tt_end_tag %]
    +

    The following example demonstrates how an empty list ('folk') can be @@ -1203,7 +1289,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.34 +1 -1 Template2/docs/src/Manual/Views.html Index: Views.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/Views.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Views.html 2002/07/09 14:41:52 1.33 +++ Views.html 2002/07/19 14:43:16 1.34 @@ -617,7 +617,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.5 +8 -0 Template2/docs/src/Manual/index.html Index: index.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Manual/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index.html 2001/12/20 09:44:11 1.4 +++ index.html 2002/07/19 14:43:16 1.5 @@ -43,6 +43,14 @@ [% END %] [% WRAPPER ndxitem + link = '../Manual/VMethods.html' + name = 'VMethods' + title = 'Virtual Methods' +-%] +The Template Toolkit provides virtual methods for manipulating variable values. Most of them are analogous to regular Perl functions of the same names. This section describes the different virtual methods that can be applied to scalar, list and hash values. +[% END %] + +[% WRAPPER ndxitem link = '../Manual/Directives.html' name = 'Directives' title = 'Template directives' 1.1 Template2/docs/src/Manual/VMethods.html Index: VMethods.html =================================================================== [%# # IMPORTANT NOTE # This documentation is generated automatically from source # templates. Any changes you make here may be lost. # # The 'docsrc' documentation source bundle is available for download # from http://www.template-toolkit.org/docs.html and contains all # the source templates, XML files, scripts, etc., from which the # documentation for the Template Toolkit is built. -%] [% META book = 'Manual' page = 'VMethods' %] [% WRAPPER toc; PROCESS tocitem title ="DESCRIPTION" subs = [ "Scalar Virtual Methods", "Hash Virtual Methods", "List Virtual Methods", "Automagic Promotion of Scalar to List for Virtual Methods", "Compound Variables" ]; PROCESS tocitem title ="AUTHOR" subs = []; PROCESS tocitem title ="VERSION" subs = []; PROCESS tocitem title ="COPYRIGHT" subs = []; END %] [% WRAPPER section title="DESCRIPTION" -%]

    The Template Toolkit provides virtual methods for manipulating variable values. Most of them are analogous to regular Perl functions of the same names. This section describes the different virtual methods that can be applied to scalar, list and hash values.

    [% WRAPPER subsection title = "Scalar Virtual Methods" -%]
    • defined

      Returns true if the value is defined.

          [% tt_start_tag %] user = get_user(uid) IF uid.defined [% tt_end_tag %]
    • length

      Returns the length of the string representation of the item:

          [% tt_start_tag %] IF password.length < 8 [% tt_end_tag %]
               Password too short, dumbass!
            [% tt_start_tag %] END [% tt_end_tag %]
    • repeat(n)

      Repeat the string a specified number of times.

          [% tt_start_tag %] name = 'foo' [% tt_end_tag %]
            [% tt_start_tag %] name.repeat(3) [% tt_end_tag %]		# foofoofoo
    • replace(search, replace)

      Outputs the string with all instances of the first argument (specified as a Perl regular expression) with the second.

          [% tt_start_tag %] name = 'foo, bar & baz' [% tt_end_tag %]
            [% tt_start_tag %] name.replace('\W+', '_') [% tt_end_tag %]    # foo_bar_baz
    • match(pattern)

      Performs a regular expression match on the string using the pattern passed as an argument. If the pattern matches the string then the method returns a reference to a list of any strings captured within parenthesis in the pattern.

          [% tt_start_tag %] name = 'Larry Wall' [% tt_end_tag %]
            [% tt_start_tag %] matches = name.match('(\w+) (\w+)') [% tt_end_tag %]
            [% tt_start_tag %] matches.1 [% tt_end_tag %], [% tt_start_tag %] matches.0 [% tt_end_tag %]		# Wall, Larry

      If the pattern does not match then the method returns false, rather than returning an empty list which Perl and the Template Toolkit both consider to be a true value. This allows you to write expression like this.

          [% tt_start_tag %] "We're not worthy!" IF name.match('Larry Wall') [% tt_end_tag %]
          [% tt_start_tag %] IF (matches = name.match('(\w+) (\w+)')) [% tt_end_tag %]
               pattern matches: [% tt_start_tag %] matches.join(', ') [% tt_end_tag %]
            [% tt_start_tag %] ELSE [% tt_end_tag %]
               pattern does not match
            [% tt_start_tag %] END [% tt_end_tag %]
    • search(pattern)

      Performs a similar function to 'match' but simply returns true if the string matches the regular expression pattern passed as an argument.

          [% tt_start_tag %] name = 'foo bar baz' [% tt_end_tag %]
            [% tt_start_tag %] name.search('bar') ? 'bar' : 'no bar' [% tt_end_tag %]	    # bar

      This virtual method is now deprecated in favour of 'match'. Move along now, there's nothing more to see here.

    • split(pattern)

      Calls Perl's split() function to split a string into a list of strings.

          [% tt_start_tag %] FOREACH dir = mypath.split(':') [% tt_end_tag %]
               [% tt_start_tag %] dir [% tt_end_tag %]
            [% tt_start_tag %] END [% tt_end_tag %]
    • chunk(size)

      Splits the value into a list of chunks of a certain size.

          [% tt_start_tag %] ccard_no = "1234567824683579";
               ccard_no.chunk(4).join
            [% tt_end_tag %]

      Output:

          1234 5678 2468 3579

      If the size is specified as a negative number then the text will be chunked from right-to-left. This gives the correct grouping for numbers, for example.

          [% tt_start_tag %] number = 1234567;
               number.chunk(-3).join(',')
            [% tt_end_tag %]

      Output:

          1,234,567
    • list

      Return the value as a single element list. This can be useful if you have a variable which may contain a single item or a list and you want to treat them equally. The 'list' method can be called against a list reference and will simply return the original reference, effectively a no-op.

          [% tt_start_tag %] thing.list.size [% tt_end_tag %]  # thing can be a scalar or a list
    • hash

      Return the value as a hash reference containing a single entry with the key 'value' indicating the original scalar value. As with the 'hash' virtual method, this is generally used to help massage data into different formats.

    • size

      Always returns 1 for scalar values. This method is provided for consistency with the hash and list size methods.

    [%- END %] [% WRAPPER subsection title = "Hash Virtual Methods" -%]
    • keys, values, each

      The regular hash operators returning lists of keys, values or both. Note how we use a '$' prefix on the 'key' variable in this example to have it interpolated (i.e. replaced with its value) before use.

          [% tt_start_tag %] FOREACH key = product.keys [% tt_end_tag %]
               [% tt_start_tag %] key [% tt_end_tag %] => [% tt_start_tag %] product.$key [% tt_end_tag %]
            [% tt_start_tag %] END [% tt_end_tag %]
    • sort, nsort

      Return a list of the keys, sorted alphabetically (sort) or numerically (nsort) according to the corresponding values in the hash.

          [% tt_start_tag %] FOREACH n = phones.sort [% tt_end_tag %]
               [% tt_start_tag %] phones.$n [% tt_end_tag %] is [% tt_start_tag %] n [% tt_end_tag %],
            [% tt_start_tag %] END [% tt_end_tag %]
    • import

      The import method can be called on a hash array to import the contents of another hash array.

          [% tt_start_tag %] hash1 = {
        	   foo => 'Foo',
                   bar => 'Bar',
               }
               hash2 = {
                   wiz => 'Wiz',
                   woz => 'Woz',
               }
            [% tt_end_tag %]
          [% tt_start_tag %] hash1.import(hash2) [% tt_end_tag %]
            [% tt_start_tag %] hash1.wiz [% tt_end_tag %]			# Wiz

      You can also call the import() method by itself to import a hash array into the current namespace hash.

          [% tt_start_tag %] user = { id => 'lwall', name => 'Larry Wall' } [% tt_end_tag %]
            [% tt_start_tag %] import(user) [% tt_end_tag %]
            [% tt_start_tag %] id [% tt_end_tag %]: [% tt_start_tag %] name [% tt_end_tag %]		# lwall: Larry Wall
    • defined, exists

      Returns a true or false value if an item in the hash denoted by the key passed as an argument is defined or exists, respectively.

          [% tt_start_tag %] hash.defined('somekey') ? 'yes' : 'no' [% tt_end_tag %]
            [% tt_start_tag %] hash.exists('somekey') ? 'yes' : 'no' [% tt_end_tag %]
    • size

      Returns the number of key => value pairs in the hash.

    • item

      Returns an item from the hash using a key passed as an argument.

          [% tt_start_tag %] hash.item('foo') [% tt_end_tag %]  # same as hash.foo
    • list

      Returns the contents of the hash in list form. An argument can be passed to indicate the desired items required in the list: 'keys' to return a list of the keys (same as hash.keys), 'values' to return a list of the values (same as hash.values), or 'each' to return as list of (key, value) pairs (same as hash.each). When called without an argument it returns a list of hash references each containing a 'key' and 'value' item representing

    [%- END %] [% WRAPPER subsection title = "List Virtual Methods" -%]
    • first, last

      Returns the first/last item in the list. The item is not removed from the list.

          [% tt_start_tag %] results.first [% tt_end_tag %] to [% tt_start_tag %] results.last [% tt_end_tag %]
    • size, max

      Returns the size of a list (number of elements) and the maximum index number (size - 1), respectively.

          [% tt_start_tag %] results.size [% tt_end_tag %] search results matched your query
    • reverse

      Returns the items of the list in reverse order.

          [% tt_start_tag %] FOREACH s = scores.reverse [% tt_end_tag %]
               ...
            [% tt_start_tag %] END [% tt_end_tag %]
    • join

      Joins the items in the list into a single string, using Perl's join function.

          [% tt_start_tag %] items.join(', ') [% tt_end_tag %]
    • grep

      Returns a list of the items in the list that match a regular expression pattern.

          [% tt_start_tag %] FOREACH directory.files.grep('\.txt$') [% tt_end_tag %]
               ...
            [% tt_start_tag %] END [% tt_end_tag %]
    • sort, nsort

      Returns the items in alpha (sort) or numerical (nsort) order.

          [% tt_start_tag %] library = books.sort [% tt_end_tag %]

      An argument can be provided to specify a search key. Where an item in the list is a hash reference, the search key will be used to retrieve a value from the hash which will then be used as the comparison value. Where an item is an object which implements a method of that name, the method will be called to return a comparison value.

          [% tt_start_tag %] library = books.sort('author') [% tt_end_tag %]

      In the example, the 'books' list can contains hash references with an 'author' key or objects with an 'author' method.

    • unshift(item), push(item)

      Adds an item to the start/end of a list.

          [% tt_start_tag %] mylist.unshift('prev item') [% tt_end_tag %]
            [% tt_start_tag %] mylist.push('next item')    [% tt_end_tag %]
    • shift, pop

      Removes the first/last item from the list and returns it.

          [% tt_start_tag %] first = mylist.shift [% tt_end_tag %]
            [% tt_start_tag %] last  = mylist.pop   [% tt_end_tag %]
    • unique

      Returns a list of the unique elements in a list, in the same order as in the list itself.

          [% tt_start_tag %] mylist = [ 1, 2, 3, 2, 3, 4, 1, 4, 3, 4, 5 ] [% tt_end_tag %]
            [% tt_start_tag %] numbers = mylist.unique [% tt_end_tag %]

      While this can be explicitly sorted, it is not required that the list be sorted before the unique elements pulled out (unlike the Unix command line utility).

          [% tt_start_tag %] numbers = mylist.unique.sort [% tt_end_tag %]
    • merge

      Returns a list composed of zero or more other lists:

          [% tt_start_tag %] list_one = [ 1 2 3 ];
               list_two = [ 4 5 6 ];
               list_three = [ 7 8 9 ];
               list_four = list_one.merge(list_two, list_three);
            [% tt_end_tag %]

      The original lists are not modified.

    • slice(from, to)

      Returns a slice of items in the list between the bounds passed as arguments. If the second argument, 'to', isn't specified, then it defaults to the last item in the list. The original list is not modified.

          [% tt_start_tag %] first_three = list.slice(0,2) [% tt_end_tag %]
          [% tt_start_tag %] last_three  = list.slice(-3, -1) [% tt_end_tag %]
    • splice(offset, length, list)

      Behaves just like Perl's splice() function allowing you to selectively remove and/or replace elements in a list. It removes 'length' items from the list, starting at 'offset' and replaces them with the items in 'list'.

         [% tt_start_tag %] play_game = [ 'play', 'scrabble' ];
              ping_pong = [ 'ping', 'pong' ];
              redundant = play_game.splice(1, 1, ping_pong);
            redundant.join;     # scrabble
              play_game.join;     # play ping pong
           [% tt_end_tag %]

      The method returns a list of the items removed by the splice. You can use the CALL directive to ignore the output if you're not planning to do anything with it.

          [% tt_start_tag %] CALL play_game.splice(1, 1, ping_pong) [% tt_end_tag %]

      As well as providing a reference to a list of replacement values, you can pass in a list of items.

         [% tt_start_tag %] CALL list.splice(-1, 0, 'foo', 'bar') [% tt_end_tag %]

      Be careful about passing just one item in as a replacement value. If it is a reference to a list then the contents of the list will be used. If it's not a list, then it will be treated as a single value. You can use square brackets around a single item if you need to be explicit:

        [% tt_start_tag %] # push a single item, an_item
             CALL list.splice(-1, 0, an_item);
           # push the items from another_list
             CALL list.splice(-1, 0, another_list);
           # push a reference to another_list
             CALL list.splice(-1, 0, [ another_list ]);
          [% tt_end_tag %]

    The following example demonstrates how an empty list ('folk') can be populated with formatted strings by using the push() method in conjunction with a FOREACH loop. The resultant list can then be printed using join.

        [% tt_start_tag %] # define some initial data
             people   => [ 
                 { id => 'tom',   name => 'Tom'     },
      	   { id => 'dick',  name => 'Richard' },
                 { id => 'larry', name => 'Larry'   },
             ]
           # define an empty list that list methods can be called against
             folk = [] 
          -[% tt_end_tag %]
        [% tt_start_tag %] folk.push("<a href=\"${person.id}.html\">$person.name</a>")
               FOREACH person = people.sort('name') -[% tt_end_tag %]
          [% tt_start_tag %] folk.join(",\n") [% tt_end_tag %]

    Output:

        <a href="larry.html">Larry</a>,
          <a href="dick.html">Richard</a>,
          <a href="tom.html">Tom</a>

    You can define your own virtual methods for scalars, lists and hash arrays. The Template::Stash package variables $SCALAR_OPS, $LIST_OPS and $HASH_OPS are references to hash arrays that define these virtual methods. HASH_OPS and LIST_OPS methods are subroutines that accept a hash/list reference as the first item. SCALAR_OPS are subroutines that accept a scalar value as the first item. Any other arguments specified when the method is called will be passed to the subroutine.

        # load Template::Stash to make method tables visible
          use Template::Stash;
        # define list method to return new list of odd numbers only
          $Template::Stash::LIST_OPS->{ odd } = sub {
      	my $list = shift;
      	return [ grep { $_ % 2 } @$list ];
          };

    template:

        [% tt_start_tag %] primes = [ 2, 3, 5, 7, 9 ] [% tt_end_tag %]
          [% tt_start_tag %] primes.odd.join(', ') [% tt_end_tag %]		# 3, 5, 7, 9

    See also the examples in the t/vmeth.t test script.

    [%- END %] [% WRAPPER subsection title = "Automagic Promotion of Scalar to List for Virtual Methods" -%]

    In addition to the scalar virtual methods listed in the previous section, you can also call any list virtual method against a scalar. The item will be automagically promoted to a single element list and the appropriate list virtual method will be called.

    One particular benefit of this comes when calling subroutines or object methods that return a list of items, rather than the preferred reference to a list of items. In this case, the Template Toolkit automatically folds the items returned into a list.

    The upshot is that you can continue to use existing Perl modules or code that returns lists of items, without having to refactor it just to keep the Template Toolkit happy (by returning references to list). Class::DBI module is just one example of a particularly useful module which returns values this way.

    If only a single item is returned from a subroutine then the Template Toolkit assumes it meant to return a single item (rather than a list of 1 item) and leaves it well alone, returning the single value as it is. If you're executing a database query, for example, you might get 1 item returned, or perhaps many items which are then folded into a list.

    The FOREACH directive will happily accept either a list or a single item which it will treat as a list. So it's safe to write directives like this, where we assume that 'something' is bound to a subroutine which might return 1 or more items:

        [% tt_start_tag %] FOREACH item = something [% tt_end_tag %]
             ...
          [% tt_start_tag %] END [% tt_end_tag %]

    The automagic promotion of scalars to single item lists means that you can also use list virtual methods safely, even if you only get one item returned. For example:

        [% tt_start_tag %] something.first   [% tt_end_tag %]
          [% tt_start_tag %] something.join    [% tt_end_tag %]
          [% tt_start_tag %] something.reverse.join(', ') [% tt_end_tag %]

    Note that this is very much a last-ditch behaviour. If the single item return is an object with a 'first' method, for example, then that will be called, as expected, in preference to the list virtual method.

    [%- END %] [% WRAPPER subsection title = "Compound Variables" -%]

    Compound 'dotted' variables may contain any number of separate elements. Each element may evaluate to any of the permitted variable types and the processor will then correctly use this value to evaluate the rest of the variable. Arguments may be passed to any of the intermediate elements.

        [% tt_start_tag %] myorg.people.sort('surname').first.fullname [% tt_end_tag %]

    Intermediate variables may be used and will behave entirely as expected.

        [% tt_start_tag %] sorted = myorg.people.sort('surname') [% tt_end_tag %]
          [% tt_start_tag %] sorted.first.fullname [% tt_end_tag %]

    This simplified dotted notation has the benefit of hiding the implementation details of your data. For example, you could implement a data structure as a hash array one day and then change it to an object the next without requiring any change to the templates.

    [%- END %] [%- END %] [% WRAPPER section title="AUTHOR" -%]

    Andy Wardley <abw@andywardley.com>

    [% ttlink('http://www.andywardley.com/', 'http://www.andywardley.com/') -%]

    [%- END %] [% WRAPPER section title="VERSION" -%]

    Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section title="COPYRIGHT" -%]
      Copyright (C) 1996-2002 Andy Wardley.  All Rights Reserved.
        Copyright (C) 1998-2002 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.

    [%- END %] From cvs@template-toolkit.org Fri Jul 19 15:43:19 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyV-000JLr-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:19 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:19 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules Template.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:19 Modified: docs/src/Modules Template.html Log: moved vmethods into separate manpage Revision Changes Path 1.34 +1 -1 Template2/docs/src/Modules/Template.html Index: Template.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Template.html 2002/07/09 14:41:54 1.33 +++ Template.html 2002/07/19 14:43:18 1.34 @@ -768,7 +768,7 @@ [% WRAPPER section title="VERSION" -%]

    -Template Toolkit version 2.07c, released on 09 July 2002. +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Fri Jul 19 15:43:31 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyh-000JNe-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:31 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:31 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin Autoformat.html CGI.html DBI.html Datafile.html Date.html Directory.html Dumper.html File.html Format.html HTML.html Iterator.html Pod.html Table.html URL.html View.html Wrap.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:31 Modified: docs/src/Modules/Template/Plugin Autoformat.html CGI.html DBI.html Datafile.html Date.html Directory.html Dumper.html File.html Format.html HTML.html Iterator.html Pod.html Table.html URL.html View.html Wrap.html Log: moved vmethods into separate manpage Revision Changes Path 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Autoformat.html Index: Autoformat.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Autoformat.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Autoformat.html 2002/07/09 14:41:59 1.46 +++ Autoformat.html 2002/07/19 14:43:23 1.47 @@ -154,8 +154,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.50, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/CGI.html Index: CGI.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/CGI.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- CGI.html 2002/07/09 14:41:59 1.46 +++ CGI.html 2002/07/19 14:43:24 1.47 @@ -82,8 +82,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.37 +2 -2 Template2/docs/src/Modules/Template/Plugin/DBI.html Index: DBI.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/DBI.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- DBI.html 2002/07/09 14:42:00 1.36 +++ DBI.html 2002/07/19 14:43:24 1.37 @@ -443,8 +443,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.46, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.47, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Datafile.html Index: Datafile.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Datafile.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Datafile.html 2002/07/09 14:42:00 1.46 +++ Datafile.html 2002/07/19 14:43:24 1.47 @@ -104,8 +104,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.52, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.53, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Date.html Index: Date.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Date.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Date.html 2002/07/09 14:42:01 1.46 +++ Date.html 2002/07/19 14:43:24 1.47 @@ -155,8 +155,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.53, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.54, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Directory.html Index: Directory.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Directory.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Directory.html 2002/07/09 14:42:01 1.46 +++ Directory.html 2002/07/19 14:43:25 1.47 @@ -246,8 +246,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Dumper.html Index: Dumper.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Dumper.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Dumper.html 2002/07/09 14:42:01 1.46 +++ Dumper.html 2002/07/19 14:43:25 1.47 @@ -103,8 +103,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/File.html Index: File.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/File.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- File.html 2002/07/09 14:42:01 1.46 +++ File.html 2002/07/19 14:43:25 1.47 @@ -267,8 +267,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Format.html Index: Format.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Format.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Format.html 2002/07/09 14:42:02 1.46 +++ Format.html 2002/07/19 14:43:25 1.47 @@ -61,8 +61,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.50, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.24 +2 -2 Template2/docs/src/Modules/Template/Plugin/HTML.html Index: HTML.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/HTML.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- HTML.html 2002/07/09 14:42:02 1.23 +++ HTML.html 2002/07/19 14:43:25 1.24 @@ -119,8 +119,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.42, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.43, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Iterator.html Index: Iterator.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Iterator.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Iterator.html 2002/07/09 14:42:02 1.46 +++ Iterator.html 2002/07/19 14:43:25 1.47 @@ -63,8 +63,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.48, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.49, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Pod.html Index: Pod.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Pod.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Pod.html 2002/07/09 14:42:03 1.46 +++ Pod.html 2002/07/19 14:43:25 1.47 @@ -61,8 +61,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.47, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.48, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Table.html Index: Table.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Table.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Table.html 2002/07/09 14:42:03 1.46 +++ Table.html 2002/07/19 14:43:26 1.47 @@ -218,8 +218,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.50, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/URL.html Index: URL.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/URL.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- URL.html 2002/07/09 14:42:03 1.46 +++ URL.html 2002/07/19 14:43:26 1.47 @@ -130,8 +130,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.50, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.51, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/View.html Index: View.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/View.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- View.html 2002/07/09 14:42:04 1.46 +++ View.html 2002/07/19 14:43:26 1.47 @@ -67,8 +67,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.47 +2 -2 Template2/docs/src/Modules/Template/Plugin/Wrap.html Index: Wrap.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Wrap.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Wrap.html 2002/07/09 14:42:04 1.46 +++ Wrap.html 2002/07/19 14:43:26 1.47 @@ -100,8 +100,8 @@ [% WRAPPER section title="VERSION" -%]

    -2.49, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +2.50, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Fri Jul 19 15:43:34 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyk-000JNz-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:34 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:34 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin/GD Constants.html Image.html Polygon.html Text.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:34 Modified: docs/src/Modules/Template/Plugin/GD Constants.html Image.html Polygon.html Text.html Log: moved vmethods into separate manpage Revision Changes Path 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Constants.html Index: Constants.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Constants.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Constants.html 2002/07/09 14:42:14 1.21 +++ Constants.html 2002/07/19 14:43:31 1.22 @@ -80,8 +80,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Image.html Index: Image.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Image.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Image.html 2002/07/09 14:42:15 1.21 +++ Image.html 2002/07/19 14:43:31 1.22 @@ -128,8 +128,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Polygon.html Index: Polygon.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Polygon.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Polygon.html 2002/07/09 14:42:15 1.21 +++ Polygon.html 2002/07/19 14:43:33 1.22 @@ -100,8 +100,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Text.html Index: Text.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Text.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Text.html 2002/07/09 14:42:15 1.21 +++ Text.html 2002/07/19 14:43:34 1.22 @@ -81,8 +81,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Fri Jul 19 15:43:37 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyn-000JOc-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:37 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:37 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin/GD/Graph area.html bars.html bars3d.html lines.html lines3d.html linespoints.html mixed.html pie.html pie3d.html points.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:37 Modified: docs/src/Modules/Template/Plugin/GD/Graph area.html bars.html bars3d.html lines.html lines3d.html linespoints.html mixed.html pie.html pie3d.html points.html Log: moved vmethods into separate manpage Revision Changes Path 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/area.html Index: area.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/area.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- area.html 2002/07/09 14:42:19 1.21 +++ area.html 2002/07/19 14:43:34 1.22 @@ -84,8 +84,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/bars.html Index: bars.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/bars.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bars.html 2002/07/09 14:42:19 1.21 +++ bars.html 2002/07/19 14:43:35 1.22 @@ -120,8 +120,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/bars3d.html Index: bars3d.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/bars3d.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bars3d.html 2002/07/09 14:42:21 1.21 +++ bars3d.html 2002/07/19 14:43:35 1.22 @@ -101,8 +101,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/lines.html Index: lines.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/lines.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- lines.html 2002/07/09 14:42:22 1.21 +++ lines.html 2002/07/19 14:43:35 1.22 @@ -109,8 +109,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/lines3d.html Index: lines3d.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/lines3d.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- lines3d.html 2002/07/09 14:42:22 1.21 +++ lines3d.html 2002/07/19 14:43:35 1.22 @@ -101,8 +101,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/linespoints.html Index: linespoints.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/linespoints.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- linespoints.html 2002/07/09 14:42:22 1.21 +++ linespoints.html 2002/07/19 14:43:35 1.22 @@ -94,8 +94,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/mixed.html Index: mixed.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/mixed.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mixed.html 2002/07/09 14:42:23 1.21 +++ mixed.html 2002/07/19 14:43:36 1.22 @@ -109,8 +109,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/pie.html Index: pie.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/pie.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pie.html 2002/07/09 14:42:23 1.21 +++ pie.html 2002/07/19 14:43:36 1.22 @@ -82,8 +82,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/pie3d.html Index: pie3d.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/pie3d.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pie3d.html 2002/07/09 14:42:24 1.21 +++ pie3d.html 2002/07/19 14:43:36 1.22 @@ -87,8 +87,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Graph/points.html Index: points.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Graph/points.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- points.html 2002/07/09 14:42:24 1.21 +++ points.html 2002/07/19 14:43:36 1.22 @@ -91,8 +91,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section From cvs@template-toolkit.org Fri Jul 19 15:43:39 2002 Received: from localhost.ourshack.com ([127.0.0.1] helo=dog.ourshack.com) by dog.ourshack.com with smtp (Exim 3.33 #1) id 17VYyo-000JOr-00 for templates-cvs@template-toolkit.org; Fri, 19 Jul 2002 15:43:38 +0100 From: cvs@template-toolkit.org To: templates-cvs@template-toolkit.org Message-Id: Date: Fri, 19 Jul 2002 15:43:38 +0100 Subject: [Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin/GD/Text Align.html Wrap.html Sender: templates-cvs-admin@template-toolkit.org Errors-To: templates-cvs-admin@template-toolkit.org X-BeenThere: templates-cvs@template-toolkit.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Notification of CVS commits for Template Toolkit List-Unsubscribe: , List-Archive: cvs 02/07/19 14:43:38 Modified: docs/src/Modules/Template/Plugin/GD/Text Align.html Wrap.html Log: moved vmethods into separate manpage Revision Changes Path 1.22 +2 -2 Template2/docs/src/Modules/Template/Plugin/GD/Text/Align.html Index: Align.html =================================================================== RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/GD/Text/Align.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Align.html 2002/07/09 14:42:29 1.21 +++ Align.html 2002/07/19 14:43:37 1.22 @@ -86,8 +86,8 @@ [% WRAPPER section title="VERSION" -%]

    -1.41, distributed as part of the -Template Toolkit version 2.07c, released on 09 July 2002. +1.42, distributed as part of the +Template Toolkit version 2.07c, released on 19 July 2002.

    [%- END %] [% WRAPPER section 1.22 +2 -2 Template2/docs/src/Modules/Template/Plug