[Templates-cvs] cvs commit: Template2/docs/src/Modules/Template/Plugin Autoformat.html CGI.html Datafile.html Date.html Directory.html Dumper.html File.html Filter.html Format.html HTML.html Image.html Iterator.html Math.html Pod.html Procedural.html String.html Table.html URL.html View.html Wrap.html
cvs@template-toolkit.org
cvs@template-toolkit.org
cvs 06/01/30 20:03:48
Modified: docs/src/Modules/Template/Plugin Autoformat.html CGI.html
Datafile.html Date.html Directory.html Dumper.html
File.html Filter.html Format.html HTML.html
Image.html Iterator.html Math.html Pod.html
Procedural.html String.html Table.html URL.html
View.html Wrap.html
Log:
commit for 2.14a
Revision Changes Path
1.63 +1 -1 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Autoformat.html 2006/01/30 15:40:33 1.62
+++ Autoformat.html 2006/01/30 20:03:46 1.63
@@ -154,7 +154,7 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-Template Toolkit version 2.15, released on 27 January 2006.
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- CGI.html 2006/01/30 15:40:33 1.62
+++ CGI.html 2006/01/30 20:03:47 1.63
@@ -104,8 +104,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.65, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.66, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Datafile.html 2006/01/30 15:40:33 1.62
+++ Datafile.html 2006/01/30 20:03:47 1.63
@@ -104,8 +104,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.67, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.68, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Date.html 2006/01/30 15:40:33 1.62
+++ Date.html 2006/01/30 20:03:47 1.63
@@ -165,8 +165,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.72, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.73, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Directory.html 2006/01/30 15:40:33 1.62
+++ Directory.html 2006/01/30 20:03:47 1.63
@@ -246,8 +246,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.65, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.66, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Dumper.html 2006/01/30 15:40:33 1.62
+++ Dumper.html 2006/01/30 20:03:47 1.63
@@ -103,8 +103,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.65, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.66, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +26 -26 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- File.html 2006/01/30 15:40:33 1.62
+++ File.html 2006/01/30 20:03:47 1.63
@@ -218,42 +218,42 @@
[% WRAPPER section
title="EXAMPLES"
-%]<pre> [% tt_start_tag %] USE file('/foo/bar/baz.html') [% tt_end_tag %]</pre>
-<pre> [% tt_start_tag %] file.path [% tt_end_tag %] # /foo/bar/baz.html
- [% tt_start_tag %] file.dir [% tt_end_tag %] # /foo/bar
- [% tt_start_tag %] file.name [% tt_end_tag %] # baz.html
- [% tt_start_tag %] file.home [% tt_end_tag %] # ../..
- [% tt_start_tag %] file.root [% tt_end_tag %] # ''
- [% tt_start_tag %] file.abspath [% tt_end_tag %] # /foo/bar/baz.html
- [% tt_start_tag %] file.ext [% tt_end_tag %] # html
+<pre> [% tt_start_tag %] file.path [% tt_end_tag %] # /foo/bar/baz.html
+ [% tt_start_tag %] file.dir [% tt_end_tag %] # /foo/bar
+ [% tt_start_tag %] file.name [% tt_end_tag %] # baz.html
+ [% tt_start_tag %] file.home [% tt_end_tag %] # ../..
+ [% tt_start_tag %] file.root [% tt_end_tag %] # ''
+ [% tt_start_tag %] file.abs [% tt_end_tag %] # /foo/bar/baz.html
+ [% tt_start_tag %] file.ext [% tt_end_tag %] # html
[% tt_start_tag %] file.mtime [% tt_end_tag %] # 987654321
[% tt_start_tag %] file.atime [% tt_end_tag %] # 987654321
- [% tt_start_tag %] file.uid [% tt_end_tag %] # 500
- [% tt_start_tag %] file.user [% tt_end_tag %] # abw</pre>
+ [% tt_start_tag %] file.uid [% tt_end_tag %] # 500
+ [% tt_start_tag %] file.user [% tt_end_tag %] # abw</pre>
<pre> [% tt_start_tag %] USE file('foo.html') [% tt_end_tag %]</pre>
-<pre> [% tt_start_tag %] file.path [% tt_end_tag %] # foo.html
- [% tt_start_tag %] file.dir [% tt_end_tag %] # ''
- [% tt_start_tag %] file.name [% tt_end_tag %] # foo.html
+<pre> [% tt_start_tag %] file.path [% tt_end_tag %] # foo.html
+ [% tt_start_tag %] file.dir [% tt_end_tag %] # ''
+ [% tt_start_tag %] file.name [% tt_end_tag %] # foo.html
[% tt_start_tag %] file.root [% tt_end_tag %] # ''
[% tt_start_tag %] file.home [% tt_end_tag %] # ''
- [% tt_start_tag %] file.abspath [% tt_end_tag %] # foo.html</pre>
+ [% tt_start_tag %] file.abs [% tt_end_tag %] # foo.html</pre>
<pre> [% tt_start_tag %] USE file('foo/bar/baz.html') [% tt_end_tag %]</pre>
-<pre> [% tt_start_tag %] file.path [% tt_end_tag %] # foo/bar/baz.html
- [% tt_start_tag %] file.dir [% tt_end_tag %] # foo/bar
- [% tt_start_tag %] file.name [% tt_end_tag %] # baz.html
+<pre> [% tt_start_tag %] file.path [% tt_end_tag %] # foo/bar/baz.html
+ [% tt_start_tag %] file.dir [% tt_end_tag %] # foo/bar
+ [% tt_start_tag %] file.name [% tt_end_tag %] # baz.html
[% tt_start_tag %] file.root [% tt_end_tag %] # ''
[% tt_start_tag %] file.home [% tt_end_tag %] # ../..
- [% tt_start_tag %] file.abspath [% tt_end_tag %] # foo/bar/baz.html</pre>
+ [% tt_start_tag %] file.abs [% tt_end_tag %] # foo/bar/baz.html</pre>
<pre> [% tt_start_tag %] USE file('foo/bar/baz.html', root='/tmp') [% tt_end_tag %]</pre>
-<pre> [% tt_start_tag %] file.path [% tt_end_tag %] # foo/bar/baz.html
- [% tt_start_tag %] file.dir [% tt_end_tag %] # foo/bar
- [% tt_start_tag %] file.name [% tt_end_tag %] # baz.html
+<pre> [% tt_start_tag %] file.path [% tt_end_tag %] # foo/bar/baz.html
+ [% tt_start_tag %] file.dir [% tt_end_tag %] # foo/bar
+ [% tt_start_tag %] file.name [% tt_end_tag %] # baz.html
[% tt_start_tag %] file.root [% tt_end_tag %] # /tmp
[% tt_start_tag %] file.home [% tt_end_tag %] # ../..
- [% tt_start_tag %] file.abspath [% tt_end_tag %] # /tmp/foo/bar/baz.html</pre>
+ [% tt_start_tag %] file.abs [% tt_end_tag %] # /tmp/foo/bar/baz.html</pre>
<pre> # calculate other file paths relative to this file and its root
- [% tt_start_tag %] USE file('foo/bar/baz.html', root => '/tmp/tt2') [% tt_end_tag %]
- [% tt_start_tag %] file.path('baz/qux.html') [% tt_end_tag %] # ../../baz/qux.html
- [% tt_start_tag %] file.dir('wiz/woz.html') [% tt_end_tag %] # ../../wiz/woz.html</pre>
+ [% tt_start_tag %] USE file('foo/bar/baz.html', root => '/tmp/tt2') [% tt_end_tag %]</pre>
+<pre> [% tt_start_tag %] file.path('baz/qux.html') [% tt_end_tag %] # ../../baz/qux.html
+ [% tt_start_tag %] file.dir('wiz/woz.html') [% tt_end_tag %] # ../../wiz/woz.html</pre>
[%- END %]
[% WRAPPER section
title="AUTHORS"
@@ -267,8 +267,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.66, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.67, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.16 +2 -2 Template2/docs/src/Modules/Template/Plugin/Filter.html
Index: Filter.html
===================================================================
RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Filter.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Filter.html 2006/01/30 15:40:33 1.15
+++ Filter.html 2006/01/30 20:03:47 1.16
@@ -285,8 +285,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-1.31, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+1.32, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Format.html 2006/01/30 15:40:33 1.62
+++ Format.html 2006/01/30 20:03:47 1.63
@@ -61,8 +61,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.65, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.66, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.40 +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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- HTML.html 2006/01/30 15:40:33 1.39
+++ HTML.html 2006/01/30 20:03:47 1.40
@@ -119,8 +119,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.57, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.58, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.11 +38 -10 Template2/docs/src/Modules/Template/Plugin/Image.html
Index: Image.html
===================================================================
RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Image.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Image.html 2006/01/30 15:40:33 1.10
+++ Image.html 2006/01/30 20:03:47 1.11
@@ -66,11 +66,32 @@
[% tt_start_tag %] USE image(name='baz.gif') [% tt_end_tag %]
[% tt_start_tag %] USE Image name='pong.gif' [% tt_end_tag %]</pre>
<p>
+A "root" parameter can be used to specify the location of the image file:
+</p>
+<pre> [% tt_start_tag %] USE Image(root='/path/to/root', name='images/home.png') [% tt_end_tag %]
+ # image path: /path/to/root/images/home.png
+ # img src: images/home.png</pre>
+<p>
+In cases where the image path and image url do not match up, specify the
+file name directly:
+</p>
+<pre> [% tt_start_tag %] USE Image(file='/path/to/home.png', name='/images/home.png') [% tt_end_tag %]</pre>
+<p>
+The "alt" parameter can be used to specify an alternate name for the
+image, for use in constructing an XHTML element (see the tag() method
+below).
+</p>
+<pre> [% tt_start_tag %] USE Image('home.png', alt="Home") [% tt_end_tag %]</pre>
+<p>
You can also provide an alternate name for an Image plugin object.
</p>
<pre> [% tt_start_tag %] USE img1 = image 'foo.gif' [% tt_end_tag %]
[% tt_start_tag %] USE img2 = image 'bar.gif' [% tt_end_tag %]</pre>
<p>
+The 'name' method returns the image file name.
+</p>
+<pre> [% tt_start_tag %] img1.name [% tt_end_tag %] # foo.gif</pre>
+<p>
The 'width' and 'height' methods return the width and height of the
image, respectively. The 'size' method returns a reference to a 2
element list containing the width and height.
@@ -80,6 +101,13 @@
height: [% tt_start_tag %] image.height [% tt_end_tag %]
size: [% tt_start_tag %] image.size.join(', ') [% tt_end_tag %]</pre>
<p>
+The 'modtime' method returns the ctime of the file in question, suitable
+for use with date.format:
+</p>
+<pre> [% tt_start_tag %] USE image 'foo.gif' [% tt_end_tag %]
+ [% tt_start_tag %] USE date [% tt_end_tag %]
+ [% tt_start_tag %] date.format(image.modtime, "%B, %e %Y") [% tt_end_tag %]</pre>
+<p>
The 'attr' method returns the height and width as HTML/XML attributes.
</p>
<pre> [% tt_start_tag %] USE image 'foo.gif' [% tt_end_tag %]
@@ -96,24 +124,24 @@
<p>
Typical output:
</p>
-<pre> <img src="foo.gif" width="60" height="20" /></pre>
+<pre> <img src="foo.gif" width="60" height="20" alt="" /></pre>
<p>
You can provide any additional attributes that should be added to the
XHTML tag.
</p>
<pre> [% tt_start_tag %] USE image 'foo.gif' [% tt_end_tag %]
- [% tt_start_tag %] image.tag(border=0, class="logo") [% tt_end_tag %]</pre>
+ [% tt_start_tag %] image.tag(class="logo" alt="Logo") [% tt_end_tag %]</pre>
<p>
Typical output:
</p>
-<pre> <img src="foo.gif" width="60" height="20" border="0" class="logo" /></pre>
+<pre> <img src="foo.gif" width="60" height="20" alt="Logo" class="logo" /></pre>
<p>
-The 'modtime' method returns the ctime of the file in question, suitable
-for use with date.format:
+Note that the 'alt' attribute is mandatory in a strict XHTML 'img'
+element (even if it's empty) so it is always added even if you don't
+explicitly provide a value for it. You can do so as an argument to
+the 'tag' method, as shown in the previous example, or as an argument
</p>
-<pre> [% tt_start_tag %] USE image 'foo.gif' [% tt_end_tag %]
- [% tt_start_tag %] USE date [% tt_end_tag %]
- [% tt_start_tag %] date.format(image.modtime, "%B, %e %Y") [% tt_end_tag %]</pre>
+<pre> [% tt_start_tag %] USE image('foo.gif', alt='Logo') [% tt_end_tag %]</pre>
[%- END %]
[% WRAPPER section
title="CATCHING ERRORS"
@@ -245,8 +273,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-1.15, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+1.17, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Iterator.html 2006/01/30 15:40:33 1.62
+++ Iterator.html 2006/01/30 20:03:47 1.63
@@ -63,8 +63,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.63, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.64, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.11 +2 -2 Template2/docs/src/Modules/Template/Plugin/Math.html
Index: Math.html
===================================================================
RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Math.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Math.html 2006/01/30 15:40:33 1.10
+++ Math.html 2006/01/30 20:03:47 1.11
@@ -129,8 +129,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-1.11, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+1.12, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Pod.html 2006/01/30 15:40:33 1.62
+++ Pod.html 2006/01/30 20:03:47 1.63
@@ -61,8 +61,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.63, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.65, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.11 +2 -2 Template2/docs/src/Modules/Template/Plugin/Procedural.html
Index: Procedural.html
===================================================================
RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/Procedural.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Procedural.html 2006/01/30 15:40:33 1.10
+++ Procedural.html 2006/01/30 20:03:47 1.11
@@ -76,8 +76,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-1.12, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+1.13, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.16 +22 -2 Template2/docs/src/Modules/Template/Plugin/String.html
Index: String.html
===================================================================
RCS file: /template-toolkit/Template2/docs/src/Modules/Template/Plugin/String.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- String.html 2006/01/30 15:40:33 1.15
+++ String.html 2006/01/30 20:03:47 1.16
@@ -206,6 +206,26 @@
...
[% tt_start_tag %] END [% tt_end_tag %]</pre>
+<li><b>substr($offset, $length, $replacement)</b><br>
+<p>
+Returns a substring starting at $offset, for $length characters.
+</p>
+<pre> [% tt_start_tag %] str = String.new('foo bar baz wiz waz woz') [% tt_end_tag %]
+ [% tt_start_tag %] str.substr(4, 3) [% tt_end_tag %] # bar</pre>
+<p>
+If $length is not specified then it returns everything from the $offset
+to the end of the string.
+</p>
+<pre> [% tt_start_tag %] str.substr(12) [% tt_end_tag %] # wiz waz woz</pre>
+<p>
+If both $length and $replacement are specified, then the method
+replaces everything from $offset for $length characters with
+$replacement. The substring removed from the string is then
+returned.
+</p>
+<pre> [% tt_start_tag %] str.substr(0, 11, 'FOO') [% tt_end_tag %] # foo bar baz
+ [% tt_start_tag %] str [% tt_end_tag %] # FOO wiz waz woz</pre>
+
</ul>
[%- END %]
[% WRAPPER subsection
@@ -410,8 +430,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.34, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.36, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Table.html 2006/01/30 15:40:33 1.62
+++ Table.html 2006/01/30 20:03:47 1.63
@@ -218,8 +218,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.65, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.66, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +13 -11 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- URL.html 2006/01/30 15:40:33 1.62
+++ URL.html 2006/01/30 20:03:47 1.63
@@ -72,8 +72,17 @@
/cgi-bin/bar.pl?mode=browse
/cgi-bin/baz.pl?mode=browse&amp;debug=1</pre>
<p>
-Additional parameters may be also be specified:
+Note that additional parameters are seperated by '&amp;' rather than
+simply '&'. This is the correct behaviour for HTML pages but is,
+unfortunately, incorrect when creating URLs that do not need to be
+encoded safely for HTML. This is likely to be corrected in a future
+version of the plugin (most probably with TT3). In the mean time, you
+can set <code>'$Template::Plugin::URL::JOINT'</code> to <code>'&'</code> to get the correct
+behaviour.
</p>
+<p>
+Additional parameters may be also be specified to the URL:
+</p>
<pre> [% tt_start_tag %] url(mode='submit', id='wiz') [% tt_end_tag %]</pre>
<p>
Which, for the same three examples, produces:
@@ -105,18 +114,11 @@
</p>
<pre> /cgi-bin/woz.pl?name=Elrich%20von%20Benjy%20d%27Weiro</pre>
<p>
-Alternate name may be provided for the plugin at construction time
+An alternate name may be provided for the plugin at construction time
as per regular Template Toolkit syntax.
</p>
<pre> [% tt_start_tag %] USE mycgi = url('cgi-bin/min.pl') [% tt_end_tag %]</pre>
<pre> [% tt_start_tag %] mycgi(debug=1) [% tt_end_tag %]</pre>
-<p>
-Note that in the following line, additional parameters are seperated
-by '&amp;', while common usage on the Web is to just use '&'. '&amp;'
-is actually the Right Way to do it. See this URL for more information:
-http://ppewww.ph.gla.ac.uk/~flavell/www/formgetbyurl.html
-</p>
-<pre> /cgi-bin/waz.pl?mode=browse&amp;debug=1&amp;test=1</pre>
[%- END %]
[% WRAPPER section
title="AUTHOR"
@@ -130,8 +132,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.69, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.70, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- View.html 2006/01/30 15:40:33 1.62
+++ View.html 2006/01/30 20:03:47 1.63
@@ -67,8 +67,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.64, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.65, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Wrap.html 2006/01/30 15:40:33 1.62
+++ Wrap.html 2006/01/30 20:03:47 1.63
@@ -100,8 +100,8 @@
[% WRAPPER section
title="VERSION"
-%]<p>
-2.64, distributed as part of the
-Template Toolkit version 2.15, released on 27 January 2006.
+2.65, distributed as part of the
+Template Toolkit version 2.15, released on 30 January 2006.
</p>
[%- END %]
[% WRAPPER section