Index: block.tal
===================================================================
RCS file: /cvs/drupal-contrib/contributions/theme-engines/phptal/block.tal,v
retrieving revision 1.5
diff -u -r1.5 block.tal
--- block.tal	20 Feb 2007 21:32:28 -0000	1.5
+++ block.tal	11 Dec 2007 19:58:22 -0000
@@ -1,4 +1,4 @@
 <div tal:attributes="class php:theme('block_class', block); id php:theme('block_id', block)">
   <h3 tal:content="block/subject" />
-  <p class="content" tal:content="block/content" />
+  <p class="content" tal:content="structure block/content" />
 </div>
Index: box.tal
===================================================================
RCS file: /cvs/drupal-contrib/contributions/theme-engines/phptal/box.tal,v
retrieving revision 1.1
diff -u -r1.1 box.tal
--- box.tal	6 Dec 2004 15:33:05 -0000	1.1
+++ box.tal	11 Dec 2007 19:58:22 -0000
@@ -1,4 +1,4 @@
 <div class="box">
   <b tal:content="title" /><br />
-  <div tal:content="content" />
+  <div tal:content="structure content" />
 </div>
Index: comment.tal
===================================================================
RCS file: /cvs/drupal-contrib/contributions/theme-engines/phptal/comment.tal,v
retrieving revision 1.1
diff -u -r1.1 comment.tal
--- comment.tal	22 Jun 2006 22:54:07 -0000	1.1
+++ comment.tal	11 Dec 2007 19:58:22 -0000
@@ -5,9 +5,9 @@
 </tal:block>
 
   <h3 class="title" tal:content="title" />
-  ${picture}
+  <img tal:condition="picture" tal:replace="structure picture" />
   <div class="author" tal:content="submitted" />
-  <div class="content" tal:content="content" />
+  <div class="content" tal:content="structure content" />
   <br tal:condition="picture" class="clear" />
   <div class="links" tal:content="php:'&raquo; ' . links" />
 </div>
Index: node.tal
===================================================================
RCS file: /cvs/drupal-contrib/contributions/theme-engines/phptal/node.tal,v
retrieving revision 1.4
diff -u -r1.4 node.tal
--- node.tal	20 Feb 2007 21:32:28 -0000	1.4
+++ node.tal	11 Dec 2007 19:58:22 -0000
@@ -1,9 +1,10 @@
 <div tal:attributes="class php:theme('node_class', sticky, zebra, status, teaser, node.type)">
-  <tal:block condition="picture" replace="picture" />
-  <h3 tal:condition="php:page == 0" class="title"><a 
+  <img tal:condition="picture" tal:replace="structure picture" />
+  <h3 tal:condition="php:page == 0" class="title"><a
     tal:attributes="href node_url" tal:content="title" /></h3>
     <span tal:condition="php:!teaser AND terms" class="taxonomy">Tags: ${terms} </span>
-    <p><tal:block replace="content | '<!--without content-->'"/>
+    <p>
+      <div class="content" tal:content="structure content | '&lt;!--without content--&gt;'" />
       <span tal:condition="links" class="links" tal:content="structure php:'»' . links . ' | ' . theme('created', node) . ' | ' . theme('permalink', node_url)" />
     </p>
 </div>
Index: page.tal
===================================================================
RCS file: /cvs/drupal-contrib/contributions/theme-engines/phptal/page.tal,v
retrieving revision 1.1
diff -u -r1.1 page.tal
--- page.tal	1 Feb 2007 21:38:11 -0000	1.1
+++ page.tal	11 Dec 2007 19:58:22 -0000
@@ -10,8 +10,9 @@
 <link rel="stylesheet" type="text/css" href="andreas01.css" media="screen,projection" />
 <link rel="stylesheet" type="text/css" href="print.css" media="print" />
 </tal:block>
-${head}
-${styles}
+<meta tal:omit-tag="" tal:content="structure head" />
+<style tal:omit-tag="" tal:content="structure styles" />
+<script tal:omit-tag="" tal:content="structure scripts" />
 </head>
 
 <body><div id="wrap">
@@ -19,7 +20,7 @@
 <div id="header">
 <h1 tal:condition="site_name"><a tal:attributes="href base_path; title php:t('Home')" tal:content="site_name">andreas01</a></h1>
 <p><strong tal:condition="site_slogan" tal:content="site_slogan">"I can see you fly. You are an angel with wings, high above the ground!"</strong></p>
-<div style="float:right;" tal:content="php:theme('links', secondary_links)">Link | Link</div>
+<div style="float:right;" tal:content="structure php:theme('links', secondary_links)">Link | Link</div>
 </div>
 
 <a tal:condition="logo" tal:attributes="href base_path; title php:t('Home')"><img id="frontphoto"
@@ -28,7 +29,7 @@
 <div id="sidebar_left">
 <div id="avmenu">
 <h2 class="hide">Menu:</h2>
-<ul tal:condition="primary_links" tal:replace="php:theme('menu_links', primary_links)">
+<ul tal:condition="primary_links" tal:replace="structure php:theme('menu_links', primary_links)">
 <li><a href="#">Welcome!</a></li>
 <li><a href="#">Current events</a></li>
 <li><a href="#">Downloads</a></li>
@@ -39,7 +40,7 @@
 </ul>
 </div>
 
-<div class="announce" tal:replace="sidebar_left">
+<div class="announce" tal:replace="structure sidebar_left">
 <h3>Latest news:</h3>
 <p><strong>Nov 28, 2005:</strong><br />
 Updated to v1.3, fixed links.</p>
@@ -51,7 +52,7 @@
 </div>
 </div>
 
-<div tal:condition="sidebar_right" id="sidebar_right" tal:content="sidebar_right">
+<div tal:condition="sidebar_right" id="sidebar_right" tal:content="structure sidebar_right">
 <h3>More info:</h3>
 <p>This is the third column, which can be used in many different ways. For example, it can be used for comments, site news, external links, ads or for more navigation links. It is all up to you!</p>
 
@@ -69,12 +70,12 @@
 </div>
 
 <div id="content">
-<div tal:condition="exists:breadcrumb" tal:replace="breadcrumb" />
+<div tal:condition="exists:breadcrumb" tal:replace="structure breadcrumb" />
 <h2 tal:content="title">Welcome to andreas01!</h2>
-<div class="tabs" tal:content="tabs" />
-<div tal:condition="exists:help" tal:replace="help" />
-<div tal:condition="exists:messages" tal:replace="messages" />
-${content}
+<div class="tabs" tal:content="structure tabs" />
+<div tal:condition="exists:help" tal:replace="structure help" />
+<div tal:condition="exists:messages" tal:replace="structure messages" />
+<span tal:omit-tag="" tal:content="structure content" />
 <tal:block condition="php:0">
 <p>This is a very simple but also very useful standard web layout: a fixed-width 3-column page with header and footer. There are thousands of variations of this layout, and this is no perfect solution. But it should be a great starting layout that you can customize in many ways and easily give a unique touch to. The layout is made of valid XHTML 1.1 and CSS only, and it has no tables. If you remove all CSS, the page still works great in text mode. I've tested it on my old mobile phone, and it works like a charm!</p>
 
@@ -89,10 +90,10 @@
 </tal:block>
 </div>
 
-<div id="footer" tal:content="footer_message">
+<div id="footer" tal:content="structure footer_message">
 Copyright &copy; 2005 Your Name. Design by <a href="http://andreasviklund.com">Andreas Viklund</a>.
 </div>
-${closure}
+<span tal:omit-tag="" tal:content="structure closure" />
 </div>
 </body>
 </html>
Index: phptal.engine
===================================================================
RCS file: /cvs/drupal-contrib/contributions/theme-engines/phptal/phptal.engine,v
retrieving revision 1.9
diff -u -r1.9 phptal.engine
--- phptal.engine	20 Feb 2007 21:32:28 -0000	1.9
+++ phptal.engine	11 Dec 2007 19:58:23 -0000
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Handles integration of templates written in PHPTAL 
+ * Handles integration of templates written in PHPTAL
  * with the Drupal theme system.
  */
 
@@ -51,7 +51,7 @@
 }
 
 function _phptal_render($file, $variables) {
-  global $theme_engine; 
+  global $theme_engine;
   global $theme_key;
 
   require_once 'PHPTAL.php';
@@ -70,7 +70,7 @@
   $phptal->debug = $debug_vars;
 
   try {
-    return html_entity_decode($phptal->execute());
+    return $phptal->execute();
   }
   catch (Exception $e) {
     watchdog('error', t('%engine.engine, %file: %message.', array('%engine' => $theme_engine, '%file' => $file,
