Browse files

approaching 2.04d

git-svn-id: svn://svn.tt2.org/tt/Template2/trunk@156 d5a88997-0a34-4036-9ed2-92fb5d660d91
  • Loading branch information...
1 parent 5c48472 commit 9be7d64acaca18c9630a25e71f4d3601ff2031be @abw committed Aug 21, 2001
Showing with 390 additions and 159 deletions.
  1. +24 −1 Changes
  2. +8 −0 MANIFEST
  3. +5 −0 MANIFEST.SKIP
  4. +162 −40 Makefile.PL
  5. +9 −9 README
  6. +1 −1 TODO
  7. +2 −2 docs/src/FAQ/FAQ.html
  8. +2 −2 docs/src/Library/HTML.html
  9. +2 −2 docs/src/Library/PostScript.html
  10. +2 −2 docs/src/Library/Splash.html
  11. +1 −1 docs/src/Manual/Config.html
  12. +1 −1 docs/src/Manual/Credits.html
  13. +29 −2 docs/src/Manual/Directives.html
  14. +1 −1 docs/src/Manual/Filters.html
  15. +1 −1 docs/src/Manual/Internals.html
  16. +1 −1 docs/src/Manual/Intro.html
  17. +1 −1 docs/src/Manual/Plugins.html
  18. +1 −1 docs/src/Manual/Refs.html
  19. +1 −1 docs/src/Manual/Syntax.html
  20. +1 −1 docs/src/Manual/Variables.html
  21. +1 −1 docs/src/Manual/Views.html
  22. +1 −1 docs/src/Modules/Template.html
  23. +2 −2 docs/src/Modules/Template/Base.html
  24. +2 −2 docs/src/Modules/Template/Config.html
  25. +2 −2 docs/src/Modules/Template/Constants.html
  26. +2 −2 docs/src/Modules/Template/Context.html
  27. +2 −2 docs/src/Modules/Template/Document.html
  28. +2 −2 docs/src/Modules/Template/Exception.html
  29. +2 −2 docs/src/Modules/Template/Filters.html
  30. +2 −2 docs/src/Modules/Template/Iterator.html
  31. +2 −2 docs/src/Modules/Template/Parser.html
  32. +2 −2 docs/src/Modules/Template/Plugin.html
  33. +2 −2 docs/src/Modules/Template/Plugin/Autoformat.html
  34. +2 −2 docs/src/Modules/Template/Plugin/CGI.html
  35. +1 −1 docs/src/Modules/Template/Plugin/DBI.html
  36. +2 −2 docs/src/Modules/Template/Plugin/Datafile.html
  37. +2 −2 docs/src/Modules/Template/Plugin/Date.html
  38. +2 −2 docs/src/Modules/Template/Plugin/Directory.html
  39. +2 −2 docs/src/Modules/Template/Plugin/Dumper.html
  40. +2 −2 docs/src/Modules/Template/Plugin/File.html
  41. +2 −2 docs/src/Modules/Template/Plugin/Format.html
  42. +2 −2 docs/src/Modules/Template/Plugin/Iterator.html
  43. +2 −2 docs/src/Modules/Template/Plugin/Pod.html
  44. +2 −2 docs/src/Modules/Template/Plugin/Table.html
  45. +2 −2 docs/src/Modules/Template/Plugin/URL.html
  46. +2 −2 docs/src/Modules/Template/Plugin/View.html
  47. +2 −2 docs/src/Modules/Template/Plugin/Wrap.html
  48. +1 −1 docs/src/Modules/Template/Plugin/XML/DOM.html
  49. +2 −2 docs/src/Modules/Template/Plugin/XML/RSS.html
  50. +2 −2 docs/src/Modules/Template/Plugin/XML/Simple.html
  51. +2 −2 docs/src/Modules/Template/Plugin/XML/XPath.html
  52. +2 −2 docs/src/Modules/Template/Plugins.html
  53. +2 −2 docs/src/Modules/Template/Provider.html
  54. +2 −2 docs/src/Modules/Template/Service.html
  55. +2 −2 docs/src/Modules/Template/Stash.html
  56. +2 −2 docs/src/Modules/Template/Test.html
  57. +24 −1 docs/src/Release/Changes.html
  58. +9 −9 docs/src/Release/README.html
  59. +1 −1 docs/src/Release/TODO.html
  60. +2 −2 docs/src/Tools/tpage.html
  61. +2 −2 docs/src/Tools/ttree.html
  62. +1 −1 docs/src/Tutorial/Datafile.html
  63. +1 −1 docs/src/Tutorial/Web.html
  64. +23 −0 docsrc/src/Release/Changes.tt2
  65. +2 −2 lib/Template.pm
  66. +2 −2 lib/Template/Config.pm
View
25 Changes
@@ -3,7 +3,7 @@
# Changes
#
# DESCRIPTION
-# Revision history for the Template Toolkit version 2.04b, detailing
+# Revision history for the Template Toolkit version 2.04d, 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
@@ -17,6 +17,29 @@
#========================================================================
#------------------------------------------------------------------------
+# Version 2.04d - 15 Aug 2001 ## DEVELOPER RELEASE ##
+#------------------------------------------------------------------------
+
+* Added gt, ge, lt and le as comparison operators which map directly
+ to their Perl counterparts. Added tests to t/stash.t and relevant
+ documentation to the IF directive.
+
+* Added 'sorted' as a flag to the HTML plugin to return attributes in
+ sorted order. Mainly for debugging purposes, as used in t/html.t.
+
+* Fixed Template::Parser.pm to recognise "\r" as a valid escape sequence
+ in double quoted strings.
+
+
+#------------------------------------------------------------------------
+# Version 2.04c - 04 Aug 2001 ## DEVELOPER RELEASE ##
+#------------------------------------------------------------------------
+
+* Fixed t/dbi.t and t/latex*.t to not complain about "Test header seen
+ twice". Thanks to Leon.
+
+
+#------------------------------------------------------------------------
# Version 2.04b - 04 Aug 2001 ## DEVELOPER RELEASE ##
#------------------------------------------------------------------------
View
8 MANIFEST
@@ -6,6 +6,7 @@ TODO
bin/README
bin/gifsplash
bin/tpage
+bin/tt-bench.pl
bin/tt2inst
bin/ttree
docs/README
@@ -422,6 +423,7 @@ lib/Template/Provider.pm
lib/Template/Service.pm
lib/Template/Stash.pm
lib/Template/Stash/Context.pm
+lib/Template/Stash/XS.pm
lib/Template/Test.pm
lib/Template/Tools/tpage.pod
lib/Template/Tools/ttree.pod
@@ -462,6 +464,7 @@ t/dumper.t
t/error.t
t/evalperl.t
t/exception.t
+t/factory.t
t/file.t
t/filter.t
t/foreach.t
@@ -494,6 +497,7 @@ t/ref.t
t/rss.t
t/service.t
t/skel.t
+t/stash-xs.t
t/stash.t
t/stashc.t
t/stop.t
@@ -643,3 +647,7 @@ templates/splash/tabset
templates/splash/text
templates/splash/ttdotorg
templates/splash/ttpower
+xs/MANIFEST
+xs/Makefile.PL
+xs/README
+xs/Stash.xs
View
5 MANIFEST.SKIP
@@ -36,3 +36,8 @@
^t/shout.t
^t/docset.t
^t/test/src/complex.org
+^xs/Makefile$
+^xs/Stash.c
+^xs/Stash.o
+^xs/XS.bs
+^xs/pm_to_blib
View
202 Makefile.PL
@@ -14,24 +14,32 @@ select STDOUT;
use vars qw( $TT_VERSION $TT_PREFIX $TT_IMAGES $TT_RUN_DBI
$TT_BUILD_DOCS $TT_SPLASH_DOCS $TT_EXAMPLES
$TT_LATEX_ENABLE $TT_LATEX_PATH $TT_PDFLATEX_PATH $TT_DVIPS_PATH
+ $TT_XS_ENABLE $TT_XS_DEFAULT
$TT_SPLASH_THEME $TT_QUIET $TT_ACCEPT $TT_YES );
# check O/S to set sensible defaults
-my ($WIN32, $FLAVOUR, $PREFIX, $MAKE);
+
+my ($WIN32, $FLAVOUR, $PREFIX, $IMAGES, $MAKE);
if ($^O =~ /win/i) {
$WIN32 = 1;
$FLAVOUR = 'Win32';
$PREFIX = 'C:/Program Files/Template Toolkit 2';
+ $IMAGES = '/tt2/images';
$MAKE = 'nmake';
}
else {
$WIN32 = 0;
$FLAVOUR = 'Unix';
$PREFIX = '/usr/local/tt2';
+ $IMAGES = '/tt2/images';
$MAKE = 'make';
}
-# read command line args
+
+# read command line args putting TT_* into $ttconfig and
+# everything else (regular Makefile.PL args, e.g. PREFIX)
+# goes into $config
+
my (%config, %ttconfig);
while ($_ = shift) {
my ($k, $v) = split(/=/);
@@ -43,23 +51,33 @@ while ($_ = shift) {
}
};
+
+# print help if they asked for it
+
if (exists $ttconfig{ TT_HELP }) {
print <<EOF;
The following options can be specified as command line
arguments to 'perl Makefile.PL'. e.g.
- perl Makefile.PL TT_PREFIX=/my/tt2/dir TT_ACCEPT=y
+ perl Makefile.PL TT_PREFIX=/my/tt2/dir TT_ACCEPT=y
+
+ TT_PREFIX installation prefix ($PREFIX)
+ TT_IMAGES images URL (/tt2/images)
+ TT_DOCS build HTML docs (y)
+ TT_SPLASH use Splash! for docs (y)
+ TT_THEME Splash! theme (default)
+ TT_EXAMPLES build HTML examples (y)
+ TT_XS_ENABLE Enable XS Stash (y)
+ TT_XS_DEFAULT Use XS Stash by default (y)
+ TT_DBI run DBI tests (y if DBI installed)
+
+ TT_LATEX install LaTeX filter (y if LaTeX found)
+ TT_LATEX_PATH path to latex (system dependant)
+ TT_PDFLATEX_PATH path to pdflatex ( " " " )
+ TT_DVIPS_PATH path to dvips ( " " " )
- TT_PREFIX installation prefix ($PREFIX)
- TT_IMAGES images URL (/tt2/images)
- TT_DOCS build HTML docs (y)
- TT_SPLASH use Splash! for docs (y)
- TT_THEME Splash! theme (default)
- TT_EXAMPLES build HTML examples (y)
- TT_DBI run DBI tests (y if DBI installed)
- TT_LATEX install LaTeX filter (y if LaTeX found)
- TT_QUIET no messages (n)
- TT_ACCEPT accept defaults (n)
+ TT_QUIET no messages (n)
+ TT_ACCEPT accept defaults (n)
By default, the Makefile.PL runs in interactive mode,
prompting for confirmation of the various configuration
@@ -72,15 +90,23 @@ EOF
exit(0);
}
+# these global package variables are the main flags used
+# in this script, here defaulted to sensible values
+
$TT_VERSION = $Template::VERSION;
$TT_PREFIX = $PREFIX;
-$TT_IMAGES = '/tt2/images';
+$TT_IMAGES = $IMAGES;
$TT_RUN_DBI = 'y';
$TT_BUILD_DOCS = 'y';
$TT_SPLASH_DOCS = 'y';
$TT_EXAMPLES = 'y';
$TT_SPLASH_THEME = 'default';
+$TT_XS_ENABLE = 'y';
+$TT_XS_DEFAULT = 'y';
$TT_LATEX_ENABLE = 'y';
+$TT_LATEX_PATH = '';
+$TT_PDFLATEX_PATH = '';
+$TT_DVIPS_PATH = '';
$TT_QUIET = 'n';
$TT_ACCEPT = 'n';
@@ -98,18 +124,24 @@ if (-f $DEFAULTS_FILE) {
$DEFAULTS = " read from '$DEFAULTS_FILE'";
}
-$TT_PREFIX = $ttconfig{ TT_PREFIX } if defined $ttconfig{ TT_PREFIX };
-$TT_IMAGES = $ttconfig{ TT_IMAGES } if defined $ttconfig{ TT_IMAGES };
-$TT_RUN_DBI = $ttconfig{ TT_DBI } if defined $ttconfig{ TT_DBI };
-$TT_BUILD_DOCS = $ttconfig{ TT_DOCS } if defined $ttconfig{ TT_DOCS };
-$TT_SPLASH_DOCS = $ttconfig{ TT_SPLASH } if defined $ttconfig{ TT_SPLASH };
-$TT_EXAMPLES = $ttconfig{ TT_EXAMPLES } if defined $ttconfig{ TT_EXAMPLES };
-$TT_SPLASH_THEME = $ttconfig{ TT_THEME } if defined $ttconfig{ TT_THEME };
-$TT_LATEX_ENABLE = $ttconfig{ TT_LATEX } if defined $ttconfig{ TT_LATEX };
-$TT_QUIET = $ttconfig{ TT_QUIET } if defined $ttconfig{ TT_QUIET };
-$TT_ACCEPT = $ttconfig{ TT_ACCEPT } if defined $ttconfig{ TT_ACCEPT };
-
-foreach ($TT_RUN_DBI, $TT_BUILD_DOCS, $TT_SPLASH_DOCS, $TT_EXAMPLES, $TT_LATEX_ENABLE) {
+$TT_PREFIX = $ttconfig{ TT_PREFIX } if $ttconfig{ TT_PREFIX };
+$TT_IMAGES = $ttconfig{ TT_IMAGES } if $ttconfig{ TT_IMAGES };
+$TT_SPLASH_THEME = $ttconfig{ TT_THEME } if $ttconfig{ TT_THEME };
+$TT_LATEX_PATH = $ttconfig{ TT_LATEX_PATH } if $ttconfig{ TT_LATEX_PATH };
+$TT_PDFLATEX_PATH = $ttconfig{ TT_PDFLATEX_PATH } if $ttconfig{ TT_PDFLATEX_PATH };
+$TT_DVIPS_PATH = $ttconfig{ TT_DVIPS_PATH } if $ttconfig{ TT_DVIPS_PATH };
+$TT_RUN_DBI = $ttconfig{ TT_DBI } if defined $ttconfig{ TT_DBI };
+$TT_BUILD_DOCS = $ttconfig{ TT_DOCS } if defined $ttconfig{ TT_DOCS };
+$TT_SPLASH_DOCS = $ttconfig{ TT_SPLASH } if defined $ttconfig{ TT_SPLASH };
+$TT_EXAMPLES = $ttconfig{ TT_EXAMPLES } if defined $ttconfig{ TT_EXAMPLES };
+$TT_LATEX_ENABLE = $ttconfig{ TT_LATEX } if defined $ttconfig{ TT_LATEX };
+$TT_XS_ENABLE = $ttconfig{ TT_XS_ENABLE } if defined $ttconfig{ TT_XS_ENABLE };
+$TT_XS_DEFAULT = $ttconfig{ TT_XS_DEFAULT } if defined $ttconfig{ TT_XS_DEFAULT };
+$TT_QUIET = $ttconfig{ TT_QUIET } if defined $ttconfig{ TT_QUIET };
+$TT_ACCEPT = $ttconfig{ TT_ACCEPT } if defined $ttconfig{ TT_ACCEPT };
+
+foreach ($TT_RUN_DBI, $TT_BUILD_DOCS, $TT_SPLASH_DOCS, $TT_EXAMPLES,
+ $TT_LATEX_ENABLE, $TT_XS_ENABLE, $TT_XS_DEFAULT ) {
$_ = 'n' if ! $_;
}
$TT_ACCEPT = 0 if $TT_ACCEPT eq 'n';
@@ -132,6 +164,7 @@ welcome_message();
version_check();
mandatory_modules();
optional_modules();
+optional_stash_xs();
optional_latex();
optional_extras();
splash_images();
@@ -200,6 +233,7 @@ my %opts = (
'VERSION_FROM' => 'lib/Template.pm',
'EXE_FILES' => [ 'bin/tpage', 'bin/ttree' ],
'PMLIBDIRS' => [ 'lib' ],
+ 'DIR' => [ ],
'PREREQ_PM' => { 'AppConfig' => 1.52 },
'dist' => {
'COMPRESS' => 'gzip',
@@ -208,6 +242,8 @@ my %opts = (
},
);
+push @{ $opts{'DIR'} }, 'xs' if $TT_XS_ENABLE;
+
if ($ExtUtils::MakeMaker::VERSION >= 5.43) {
$opts{ AUTHOR } = 'Andy Wardley <abw@kfs.org>';
$opts{ ABSTRACT } =
@@ -227,6 +263,10 @@ EOF
message(<<EOF) if $TT_BUILD_DOCS;
+
+Installation Notes
+------------------
+
Please note that the installation of the optional components and
building of the HTML documentation is performed at the "make install"
stage as the effective user at that time. This implies that this user
@@ -253,11 +293,11 @@ sub welcome_message {
=============================
Using $FLAVOUR defaults$DEFAULTS.
+
+Run 'perl Makefile.PL TT_HELP' for a summary of options.
EOF
print "Messages suppressed (TT_QUIET). " if $TT_QUIET;
print "Accepting defaults automatically (TT_ACCEPT)." if $TT_ACCEPT;
- print "\nRun 'perl Makefile.PL TT_HELP' for further info.\n"
- if $TT_QUIET || $TT_ACCEPT;
}
@@ -286,7 +326,7 @@ IMPORTANT NOTE:
Please consult the README and Changes file for further details.
Most of the changes are in the more obscure features and
directives so hopefully you will find the upgrade process fairly
- painless.
+ painless. If you're feeling brave, then answer 'y', otherwise 'n'.
EOF
exit unless ttprompt("Do you want to continue?", 'y') =~ /y/i;
@@ -340,6 +380,9 @@ EOF
sub optional_modules {
message(<<EOF);
+External Modules
+----------------
+
The Template Toolkit includes a number of plugin modules, some of
which interface to external Perl modules available from CPAN. All the
plugins will be installed regardless so that they will automatically
@@ -378,6 +421,56 @@ EOF
}
+#------------------------------------------------------------------------
+# optional_stash_xs()
+#
+# Prompt for installation and default use of XS Stash.
+#------------------------------------------------------------------------
+
+sub optional_stash_xs {
+# return if $TT_ACCEPT && (! $TT_XS_ENABLE || $TT_XS_ENABLE eq 'n');
+
+ message(<<EOF);
+
+
+XS Stash: TT2 now twice as fast!
+--------------------------------
+
+We have a new, high speed version of the Template::Stash. It's
+a Perl XS module which can evaluate templates about twice as fast as
+the pure-Perl version. Although still strictly "experimental", it
+has been widely tested and is thought to be stable and reliable.
+
+You may choose to build the XS module, but it won't be enabled by
+default. Instead, the recommended usage is something like this:
+
+ use Template;
+ use Template::Stash::XS;
+
+ my \$tt = new Template ({ STASH => new Template::Stash::XS, ... });
+
+However, if you are feeling brave, the XS version can be set as the
+default stash for all Template objects. (Also see \$STASH in the
+Template/Config.pm module, e.g. 'perldoc Template::Config').
+
+EOF
+
+ $TT_XS_ENABLE = (ttprompt('Do you want to build the XS Stash module?',
+ $TT_XS_ENABLE) =~ /^y/i);
+
+ if ($TT_XS_ENABLE) {
+
+ $TT_XS_DEFAULT = (ttprompt('Do you want to use the XS Stash for all Templates?',
+ $TT_XS_DEFAULT) =~ /^y/i);
+
+ if ($TT_XS_DEFAULT) {
+ fix_file('lib/Template/Config.pm',
+ '$STASH',
+ 'Template::Stash::XS');
+ }
+ }
+}
+
#------------------------------------------------------------------------
# optional_latex()
@@ -386,14 +479,18 @@ EOF
#------------------------------------------------------------------------
sub optional_latex {
- return if ! $TT_LATEX_ENABLE || $TT_LATEX_ENABLE eq 'n';
+# return if $TT_ACCEPT && (! $TT_LATEX_ENABLE || $TT_LATEX_ENABLE eq 'n');
- $TT_LATEX_PATH ||= findProgram($ENV{PATH}, "latex") || '';
- $TT_PDFLATEX_PATH ||= findProgram($ENV{PATH}, "pdflatex") || '';
- $TT_DVIPS_PATH ||= findProgram($ENV{PATH}, "dvips") || '';
+ $TT_LATEX_PATH ||= find_program($ENV{PATH}, "latex") || '';
+ $TT_PDFLATEX_PATH ||= find_program($ENV{PATH}, "pdflatex") || '';
+ $TT_DVIPS_PATH ||= find_program($ENV{PATH}, "dvips") || '';
message(<<EOF);
+
+LaTeX Support
+-------------
+
TT2 supports PDF, DVI and PostScript output using the latex filter,
implemented with the programs pdflatex, latex and dvips.
@@ -438,7 +535,6 @@ EOF
}
-
#------------------------------------------------------------------------
# optional_extras()
#
@@ -448,6 +544,10 @@ EOF
sub optional_extras {
message(<<EOF);
+
+Optional Extras
+---------------
+
In additional to the Perl modules and POD documentation installed in
the usual way, the Template Toolkit distribution also contains a
number of optional components:
@@ -476,7 +576,7 @@ flavour to your operating system (suggestions for suitable defaults
for other platforms welcome).
EOF
- $TT_PREFIX = ttprompt('Installation directory', $TT_PREFIX);
+ $TT_PREFIX = ttprompt('Installation directory', $TT_PREFIX || $PREFIX);
}
else {
$TT_PREFIX = '';
@@ -498,6 +598,10 @@ sub splash_images {
message(<<EOF);
+
+Splash!
+-------
+
The Splash! template library uses a number of (very) small images to
build user interface components. These will be installed into the
directory:
@@ -538,7 +642,7 @@ manpage at your leisure to find out more).
EOF
}
- $TT_IMAGES = ttprompt('URL base for TT2 images?', $TT_IMAGES);
+ $TT_IMAGES = ttprompt('URL base for TT2 images?', $TT_IMAGES || $IMAGES);
$TT_IMAGES =~ s[/$][]g; # just in case
fix_file('templates/splash/config', 'images', "$TT_IMAGES/splash");
}
@@ -559,6 +663,10 @@ sub html_docs {
message(<<EOF);
+
+HTML Documentation
+------------------
+
The modules comprising the Template Toolkit contain comprehensive POD
documentation which can be browsed using 'perldoc' or 'man' (if your
system supports it). In additional, the distribution also includes a
@@ -683,6 +791,10 @@ sub html_examples {
message(<<EOF);
+
+HTML Examples
+-------------
+
A number of examples showing use of the HTML, Splash! and PostScript
libraries will be installed into:
@@ -734,8 +846,11 @@ EOF
sub write_defaults {
open(FP, "> $DEFAULTS_FILE") || die "$DEFAULTS_FILE: $!\n";
- my ($ttdbi, $ttdocs, $ttsplash, $ttex, $ttlatex) = map { $_ ? 'y' : 'n' }
- ( $TT_RUN_DBI, $TT_BUILD_DOCS, $TT_SPLASH_DOCS, $TT_EXAMPLES, $TT_LATEX_ENABLE );
+ my ( $ttdbi, $ttdocs, $ttsplash, $ttex,
+ $ttlatex, $ttxs_enable, $ttxs_default )
+ = map { $_ ? 'y' : 'n' }
+ ( $TT_RUN_DBI, $TT_BUILD_DOCS, $TT_SPLASH_DOCS, $TT_EXAMPLES,
+ $TT_LATEX_ENABLE, $TT_XS_ENABLE, $TT_XS_DEFAULT );
print FP <<EOF;
\$TT_PREFIX = '$TT_PREFIX';
\$TT_IMAGES = '$TT_IMAGES';
@@ -748,6 +863,8 @@ sub write_defaults {
\$TT_LATEX_PATH = '$TT_LATEX_PATH';
\$TT_PDFLATEX_PATH = '$TT_PDFLATEX_PATH';
\$TT_DVIPS_PATH = '$TT_DVIPS_PATH';
+\$TT_XS_ENABLE = '$ttxs_enable';
+\$TT_XS_DEFAULT = '$ttxs_default';
\$TT_ACCEPT = '$TT_ACCEPT';
\$TT_QUIET = '$TT_QUIET';
1;
@@ -869,6 +986,9 @@ sub dbi_config {
message(<<EOF);
+DBI Test Configuration
+----------------------
+
Please enter the driver name for the test database.
The DBD drivers installed on your system are
@@ -951,15 +1071,17 @@ sub fix_file {
#------------------------------------------------------------------------
-# findProgram($path, $prog)
+# find_program($path, $prog)
#
# Find a program, $prog, by traversing the given directory path, $path.
# Returns full path if the program is found.
#
# Written by Craig Barratt, Richard Tietjen add fixes for Win32.
+#
+# abw changed name from studly caps findProgram() to find_program() :-)
#------------------------------------------------------------------------
-sub findProgram {
+sub find_program {
my($path, $prog) = @_;
my $sep = $WIN32 ? qr/;/ : qr/:/;
foreach my $dir ( split($sep, $path) ) {
View
18 README
@@ -1,9 +1,9 @@
Template Toolkit
- Version 2.04b
+ Version 2.04d
- 04 August 2001
+ 29 August 2001
Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved
Copyright (C) 1998-2001 Canon Research Centre Europe Ltd.
@@ -42,8 +42,8 @@ need to install them. They're all available from CPAN if you do.
To install the Template Toolkit:
- tar zxf Template-Toolkit-2.04b.tar.gz
- cd Template-Toolkit-2.04b
+ tar zxf Template-Toolkit-2.04d.tar.gz
+ cd Template-Toolkit-2.04d
perl Makefile.PL
make
make test
@@ -295,19 +295,19 @@ The Template Toolkit is distributed as a gzipped tar archive file:
Template-Toolkit-<version>.tar.gz
-where <version> represents the current version number, e.g. 2.04b.
+where <version> represents the current version number, e.g. 2.04d.
To install the Template Toolkit, unpack the distribution archive to
create an installation directory. Something like this:
- tar zxf Template-Toolkit-2.04b.tar.gz
+ tar zxf Template-Toolkit-2.04d.tar.gz
or
- gunzip Template-Toolkit-2.04b.tar.gz
- tar xf Template-Toolkit-2.04b.tar
+ gunzip Template-Toolkit-2.04d.tar.gz
+ tar xf Template-Toolkit-2.04d.tar
You can then 'cd' into the directory created,
- cd Template-Toolkit-2.04b
+ cd Template-Toolkit-2.04d
and perform the usual Perl installation procedure:
View
2 TODO
@@ -3,7 +3,7 @@
# TODO
#
# DESCRIPTION
-# TODO list for the Template Toolkit version 2.04b, containing
+# TODO list for the Template Toolkit version 2.04d, containing
# known bugs, limitations, planned enhancements, long term visions
# and a few whacky ideas.
#
View
4 docs/src/FAQ/FAQ.html
@@ -207,8 +207,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Library/HTML.html
@@ -307,8 +307,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Library/PostScript.html
@@ -39,8 +39,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Library/Splash.html
@@ -980,8 +980,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Config.html
@@ -1521,7 +1521,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Credits.html
@@ -132,7 +132,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
31 docs/src/Manual/Directives.html
@@ -568,7 +568,7 @@
<p>
The following conditional and boolean operators may be used:
</p>
-<pre> == != &lt; &lt;= &gt; &gt;= ! &amp;&amp; || and or not</pre>
+<pre> == != &lt; &lt;= &gt; &gt;= &amp;&amp; || !</pre>
<p>
Conditions may be arbitrarily complex and are evaluated with the same
precedence as in Perl. Parenthesis may be used to explicitly
@@ -580,6 +580,33 @@
[% tt_start_tag %] ELSIF more &gt; less [% tt_end_tag %]
That's more or less correct.
[% tt_start_tag %] END [% tt_end_tag %]</pre>
+<p>
+In addition, the following operators can be used as aliases for the
+above.
+</p>
+<pre> eq ne lt le gt ge and or not</pre>
+<p>
+In Perl, the first set of operators (<code>'=='</code>, <code>'!='</code>, <code>'&lt;'</code>,
+<code>'&lt;='</code>, <code>'&gt;'</code> and <code>'&gt;='</code>) compare numerically while the second
+set (<code>'eq'</code>, <code>'ne'</code>, <code>'lt'</code>, <code>'le'</code>, <code>'gt'</code> and <code>'ge'</code>) compare in a
+stringwise manner. For historical reasons, the Template Toolkit has
+always internally converted <code>'=='</code> and <code>'!='</code> to their stringwise
+equivalents <code>'eq'</code> and <code>'ne'</code> because it (mostly) works as expected and
+avoids warnings raised by trying to compare non-numerical values.
+</p>
+<p>
+However, this approach doesn't work so well with the other operators
+because it causes problems when comparing numbers like '0100' and
+'11'. A stringwise comparison would consider 0100 &lt; 11 which it
+clearly isn't in numerical terms. So the decision was made to leave
+<code>'=='</code> and <code>'!='</code> mapping to <code>'eq'</code> and <code>'ne'</code> as they currently do, but
+to have all the other operators map directly to their Perl equivalents.
+</p>
+<p>
+In a future version of the Template Toolkit (most probably not until
+v3) this is likely to change so that all operators, including <code>'=='</code>,
+<code>'eq'</code>, <code>'!='</code> and <code>'ne'</code> map directly to their Perl counterparts.
+</p>
<li><b>SWITCH / CASE</b><br>
@@ -1941,7 +1968,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Filters.html
@@ -417,7 +417,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Internals.html
@@ -363,7 +363,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Intro.html
@@ -253,7 +253,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Plugins.html
@@ -441,7 +441,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Refs.html
@@ -123,7 +123,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Syntax.html
@@ -269,7 +269,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Variables.html
@@ -962,7 +962,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Manual/Views.html
@@ -602,7 +602,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Modules/Template.html
@@ -811,7 +811,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Base.html
@@ -98,8 +98,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.20, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.21, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Config.html
@@ -137,8 +137,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.18, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.19, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Constants.html
@@ -89,8 +89,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.19, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.20, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Context.html
@@ -612,8 +612,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.25, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.26, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Document.html
@@ -190,8 +190,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.20, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.21, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Exception.html
@@ -79,8 +79,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.16, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.17, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Filters.html
@@ -600,8 +600,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.21, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.22, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Iterator.html
@@ -215,8 +215,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.18, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.19, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Parser.html
@@ -444,8 +444,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.24, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.25, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
<pre> </pre>
[%- END %]
View
4 docs/src/Modules/Template/Plugin.html
@@ -228,8 +228,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.19, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.20, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Autoformat.html
@@ -140,8 +140,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.18, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.19, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/CGI.html
@@ -70,8 +70,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Modules/Template/Plugin/DBI.html
@@ -231,7 +231,7 @@
title="VERSION"
-%]<p>
1.04, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Datafile.html
@@ -90,8 +90,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.19, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.20, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Date.html
@@ -132,8 +132,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Directory.html
@@ -232,8 +232,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Dumper.html
@@ -87,8 +87,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/File.html
@@ -263,8 +263,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Format.html
@@ -49,8 +49,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.18, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.19, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Iterator.html
@@ -51,8 +51,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.16, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.17, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Pod.html
@@ -49,8 +49,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.15, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.16, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Table.html
@@ -192,8 +192,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.18, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.19, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/URL.html
@@ -118,8 +118,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.18, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.19, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/View.html
@@ -55,8 +55,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/Wrap.html
@@ -88,8 +88,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Modules/Template/Plugin/XML/DOM.html
@@ -393,7 +393,7 @@
title="VERSION"
-%]<p>
2.6, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/XML/RSS.html
@@ -123,8 +123,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.16, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.17, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/XML/Simple.html
@@ -55,8 +55,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.15, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.16, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugin/XML/XPath.html
@@ -92,8 +92,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Plugins.html
@@ -648,8 +648,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.21, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.22, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Provider.html
@@ -367,8 +367,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.19, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.20, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Service.html
@@ -430,8 +430,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.19, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.20, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Stash.html
@@ -158,8 +158,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.26, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.27, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Modules/Template/Test.html
@@ -280,8 +280,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.18, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.19, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
25 docs/src/Release/Changes.html
@@ -7,7 +7,7 @@
# Changes
#
# DESCRIPTION
-# Revision history for the Template Toolkit version 2.04b, detailing
+# Revision history for the Template Toolkit version 2.04d, 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 &quot;Gotchas!&quot; that you might have to
@@ -21,6 +21,29 @@
#========================================================================
#------------------------------------------------------------------------
+# Version 2.04d - 15 Aug 2001 ## DEVELOPER RELEASE ##
+#------------------------------------------------------------------------
+
+* Added gt, ge, lt and le as comparison operators which map directly
+ to their Perl counterparts. Added tests to t/stash.t and relevant
+ documentation to the IF directive.
+
+* Added 'sorted' as a flag to the HTML plugin to return attributes in
+ sorted order. Mainly for debugging purposes, as used in t/html.t.
+
+* Fixed Template::Parser.pm to recognise &quot;\r&quot; as a valid escape sequence
+ in double quoted strings.
+
+
+#------------------------------------------------------------------------
+# Version 2.04c - 04 Aug 2001 ## DEVELOPER RELEASE ##
+#------------------------------------------------------------------------
+
+* Fixed t/dbi.t and t/latex*.t to not complain about &quot;Test header seen
+ twice&quot;. Thanks to Leon.
+
+
+#------------------------------------------------------------------------
# Version 2.04b - 04 Aug 2001 ## DEVELOPER RELEASE ##
#------------------------------------------------------------------------
View
18 docs/src/Release/README.html
@@ -5,9 +5,9 @@
Template Toolkit
- Version 2.04b
+ Version 2.04d
- 04 August 2001
+ 29 August 2001
Copyright (C) 1996-2001 Andy Wardley. All Rights Reserved
Copyright (C) 1998-2001 Canon Research Centre Europe Ltd.
@@ -46,8 +46,8 @@
To install the Template Toolkit:
- tar zxf Template-Toolkit-2.04b.tar.gz
- cd Template-Toolkit-2.04b
+ tar zxf Template-Toolkit-2.04d.tar.gz
+ cd Template-Toolkit-2.04d
perl Makefile.PL
make
make test
@@ -299,19 +299,19 @@
Template-Toolkit-&lt;version&gt;.tar.gz
-where &lt;version&gt; represents the current version number, e.g. 2.04b.
+where &lt;version&gt; represents the current version number, e.g. 2.04d.
To install the Template Toolkit, unpack the distribution archive to
create an installation directory. Something like this:
- tar zxf Template-Toolkit-2.04b.tar.gz
+ tar zxf Template-Toolkit-2.04d.tar.gz
or
- gunzip Template-Toolkit-2.04b.tar.gz
- tar xf Template-Toolkit-2.04b.tar
+ gunzip Template-Toolkit-2.04d.tar.gz
+ tar xf Template-Toolkit-2.04d.tar
You can then 'cd' into the directory created,
- cd Template-Toolkit-2.04b
+ cd Template-Toolkit-2.04d
and perform the usual Perl installation procedure:
View
2 docs/src/Release/TODO.html
@@ -7,7 +7,7 @@
# TODO
#
# DESCRIPTION
-# TODO list for the Template Toolkit version 2.04b, containing
+# TODO list for the Template Toolkit version 2.04d, containing
# known bugs, limitations, planned enhancements, long term visions
# and a few whacky ideas.
#
View
4 docs/src/Tools/tpage.html
@@ -61,8 +61,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
4 docs/src/Tools/ttree.html
@@ -112,8 +112,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.17, distributed as part of the
-Template Toolkit version 2.04b, released on 04 August 2001.
+2.18, distributed as part of the
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Tutorial/Datafile.html
@@ -430,7 +430,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
2 docs/src/Tutorial/Web.html
@@ -765,7 +765,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
</p>
[%- END %]
[% WRAPPER section
View
23 docsrc/src/Release/Changes.tt2
@@ -18,6 +18,29 @@
#========================================================================
#------------------------------------------------------------------------
+# Version 2.04d - 15 Aug 2001 ## DEVELOPER RELEASE ##
+#------------------------------------------------------------------------
+
+* Added gt, ge, lt and le as comparison operators which map directly
+ to their Perl counterparts. Added tests to t/stash.t and relevant
+ documentation to the IF directive.
+
+* Added 'sorted' as a flag to the HTML plugin to return attributes in
+ sorted order. Mainly for debugging purposes, as used in t/html.t.
+
+* Fixed Template::Parser.pm to recognise "\r" as a valid escape sequence
+ in double quoted strings.
+
+
+#------------------------------------------------------------------------
+# Version 2.04c - 04 Aug 2001 ## DEVELOPER RELEASE ##
+#------------------------------------------------------------------------
+
+* Fixed t/dbi.t and t/latex*.t to not complain about "Test header seen
+ twice". Thanks to Leon.
+
+
+#------------------------------------------------------------------------
# Version 2.04b - 04 Aug 2001 ## DEVELOPER RELEASE ##
#------------------------------------------------------------------------
View
4 lib/Template.pm
@@ -39,7 +39,7 @@ use File::Path;
## This is the main version number for the Template Toolkit.
## It is extracted by ExtUtils::MakeMaker and inserted in various places.
-$VERSION = '2.04b';
+$VERSION = '2.04d';
$ERROR = '';
$DEBUG = 0;
@@ -889,7 +889,7 @@ L<http://www.andywardley.com/|http://www.andywardley.com/>
=head1 VERSION
-Template Toolkit version 2.04b, released on 04 August 2001.
+Template Toolkit version 2.04d, released on 29 August 2001.
=head1 COPYRIGHT
View
4 lib/Template/Config.pm
@@ -42,10 +42,10 @@ $PARSER = 'Template::Parser';
$PLUGINS = 'Template::Plugins';
$PROVIDER = 'Template::Provider';
$SERVICE = 'Template::Service';
-$STASH = 'Template::Stash';
+$STASH = 'Template::Stash::XS';
# the following is set at installation time by the Makefile.PL
-$INSTDIR = '';
+$INSTDIR = '/usr/local/tt2';
# LaTeX executable paths set at installation time by the Makefile.PL
# Empty strings cause the latex(pdf|dvi|ps) filters to throw an error.

0 comments on commit 9be7d64

Please sign in to comment.