Fixed stripping of space before tal:content

phptal · Jan 4, 2012 · 8059cdf · 8059cdf
1 parent 27424eb
commit 8059cdf
Show file tree

Hide file tree

Showing 58 changed files with 100 additions and 149 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ docs::
 
 doc::
 	$(MAKE) $(MFLAGS) -C doc
-	
+
 clean::
 	@if test -d ./build/; then rm -rf ./build/; fi
 	@find . \( -name \*.rej -o -name \*.orig -o -name .DS_Store -o -name ._\* \) -print -exec rm {} \;
diff --git a/build.xml b/build.xml
@@ -151,13 +151,13 @@ PHPTAL compiles templates to PHP for best performance and supports selective cac
           <element key="name" value="gettext" />
           <element key="optional" value="yes" />
         </element>
-        
+
         <element>
           <element key="type" value="ext" />
           <element key="rel" value="has" />
           <element key="name" value="SimpleXML" />
           <element key="optional" value="yes" />
-        </element>        
+        </element>
 
         <element>
           <element key="type" value="ext" />
@@ -191,8 +191,8 @@ PHPTAL compiles templates to PHP for best performance and supports selective cac
     <delete file="${tarfile}"/>
     <tar destfile="${tarfile}">
       <fileset dir="${build.base.dir}">
-     	 <include name="${pkgname}/**" />
-     	 <include name="package.xml" />
+	 <include name="${pkgname}/**" />
+	 <include name="package.xml" />
       </fileset>
     </tar>
   </target>
@@ -209,8 +209,8 @@ PHPTAL compiles templates to PHP for best performance and supports selective cac
     <delete file="${tarfilepear}"/>
     <tar destfile="${tarfilepear}">
       <fileset dir="${build.base.dir}">
-     	 <include name="${pkgname}/**" />
-     	 <include name="package.xml" />
+	 <include name="${pkgname}/**" />
+	 <include name="package.xml" />
       </fileset>
     </tar>
   </target>

diff --git a/classes/PHPTAL/ConfigurationException.php b/classes/PHPTAL/ConfigurationException.php
@@ -22,4 +22,3 @@
 class PHPTAL_ConfigurationException extends PHPTAL_Exception
 {
 }
-
diff --git a/classes/PHPTAL/Dom/CDATASection.php b/classes/PHPTAL/Dom/CDATASection.php
@@ -45,4 +45,3 @@ public function generateCode(PHPTAL_Php_CodeWriter $codewriter)
         }
     }
 }
-
diff --git a/classes/PHPTAL/Dom/PHP5DOMDocumentBuilder.php b/classes/PHPTAL/Dom/PHP5DOMDocumentBuilder.php
@@ -251,4 +251,3 @@ public function setEncoding($encoding)
         }
     }
 }
-
diff --git a/classes/PHPTAL/Dom/PHPTALDocumentBuilder.php b/classes/PHPTAL/Dom/PHPTALDocumentBuilder.php
@@ -164,4 +164,3 @@ public function setEncoding($encoding)
         $this->encoding = $encoding;
     }
 }
-
diff --git a/classes/PHPTAL/Dom/XmlDeclaration.php b/classes/PHPTAL/Dom/XmlDeclaration.php
@@ -27,4 +27,3 @@ public function generateCode(PHPTAL_Php_CodeWriter $codewriter)
         $codewriter->doXmlDeclaration();
     }
 }
-
diff --git a/classes/PHPTAL/IOException.php b/classes/PHPTAL/IOException.php
@@ -23,4 +23,3 @@
 class PHPTAL_IOException extends PHPTAL_Exception
 {
 }
-
diff --git a/classes/PHPTAL/MacroMissingException.php b/classes/PHPTAL/MacroMissingException.php
@@ -22,4 +22,3 @@
 class PHPTAL_MacroMissingException extends PHPTAL_TemplateException
 {
 }
-
diff --git a/classes/PHPTAL/ParserException.php b/classes/PHPTAL/ParserException.php
@@ -22,4 +22,3 @@
 class PHPTAL_ParserException extends PHPTAL_TemplateException
 {
 }
-
diff --git a/classes/PHPTAL/Php/Attribute/I18N/Attributes.php b/classes/PHPTAL/Php/Attribute/I18N/Attributes.php
@@ -116,4 +116,3 @@ private function _getTranslationCode(PHPTAL_Php_CodeWriter $codewriter, $key)
     }
 }
 
-
diff --git a/classes/PHPTAL/Php/Attribute/I18N/Domain.php b/classes/PHPTAL/Php/Attribute/I18N/Domain.php
@@ -48,4 +48,3 @@ public function after(PHPTAL_Php_CodeWriter $codewriter)
     }
 }
 
-
diff --git a/classes/PHPTAL/Php/Attribute/I18N/Translate.php b/classes/PHPTAL/Php/Attribute/I18N/Translate.php
@@ -128,4 +128,3 @@ private function _prepareNames(PHPTAL_Php_CodeWriter $codewriter, PHPTAL_Dom_Nod
     }
 }
 
-
diff --git a/classes/PHPTAL/Php/Attribute/PHPTAL/Debug.php b/classes/PHPTAL/Php/Attribute/PHPTAL/Debug.php
@@ -32,4 +32,3 @@ public function after(PHPTAL_Php_CodeWriter $codewriter)
     private $_oldMode;
 }
 
-
diff --git a/classes/PHPTAL/Php/Attribute/PHPTAL/Tales.php b/classes/PHPTAL/Php/Attribute/PHPTAL/Tales.php
@@ -43,4 +43,3 @@ public function after(PHPTAL_Php_CodeWriter $codewriter)
     private $_oldMode;
 }
 
-
diff --git a/classes/PHPTAL/Php/Attribute/TAL/Comment.php b/classes/PHPTAL/Php/Attribute/TAL/Comment.php
@@ -28,4 +28,3 @@ public function after(PHPTAL_Php_CodeWriter $codewriter)
     }
 }
 
-
diff --git a/classes/PHPTAL/Php/Attribute/TAL/Condition.php b/classes/PHPTAL/Php/Attribute/TAL/Condition.php
@@ -91,4 +91,3 @@ public function talesChainDefaultKeyword(PHPTAL_Php_TalesChainExecutor $executor
 
 }
 
-
diff --git a/classes/PHPTAL/Php/Attribute/TAL/OmitTag.php b/classes/PHPTAL/Php/Attribute/TAL/OmitTag.php
@@ -68,4 +68,3 @@ public function after(PHPTAL_Php_CodeWriter $codewriter)
     }
 }
 
-
diff --git a/classes/PHPTAL/Php/CodeWriter.php b/classes/PHPTAL/Php/CodeWriter.php
@@ -494,4 +494,3 @@ private function popCodeWriterContext()
     private $_xmldeclaration = "";
 }
 
-
diff --git a/classes/PHPTAL/Php/Transformer.php b/classes/PHPTAL/Php/Transformer.php
@@ -416,4 +416,3 @@ private static function isVarNameChar($c)
     );
 }
 
-
diff --git a/classes/PHPTAL/PreFilter/Compress.php b/classes/PHPTAL/PreFilter/Compress.php
@@ -121,7 +121,7 @@ function filterDOM(PHPTAL_Dom_Element $root)
         // tal:content may replace element with something without space
         if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal','content')) {
             $this->had_space = false;
-
+            $this->most_recent_text_node = null;
         }
 
         // line break caused by end tag
@@ -208,10 +208,10 @@ protected function normalizeAttributes(PHPTAL_Dom_Element $element)
             $attrs_by_qname[$attrnode->getQualifiedName()] = $attrnode;
         }
 
-    	if (count($attrs_by_qname) > 1) {
-    		uksort($attrs_by_qname, array($this, 'compareQNames'));
-    		$element->setAttributeNodes(array_values($attrs_by_qname));
-    	}
+	if (count($attrs_by_qname) > 1) {
+		uksort($attrs_by_qname, array($this, 'compareQNames'));
+		$element->setAttributeNodes(array_values($attrs_by_qname));
+	}
     }
 
     /**

diff --git a/classes/PHPTAL/TalesRegistry.php b/classes/PHPTAL/TalesRegistry.php
@@ -47,7 +47,7 @@ protected function __construct()
         $this->registerPrefix('exists', array('PHPTAL_Php_TalesInternal', 'exists'));
         $this->registerPrefix('number', array('PHPTAL_Php_TalesInternal', 'number'));
         $this->registerPrefix('true', array('PHPTAL_Php_TalesInternal', 'true'));
-        
+
         // these are added as fallbacks
         $this->registerPrefix('json', array('PHPTAL_Php_TalesInternal', 'json'), true);
         $this->registerPrefix('urlencode', array('PHPTAL_Php_TalesInternal', 'urlencode'), true);
@@ -109,7 +109,7 @@ public function isRegistered($prefix)
     }
 
     private function findUnregisteredCallback($typePrefix)
-    {        
+    {
         // class method
         if (strpos($typePrefix, '.')) {
             $classCallback = explode('.', $typePrefix, 2);
@@ -135,7 +135,7 @@ private function findUnregisteredCallback($typePrefix)
         if (function_exists($func)) {
             return $func;
         }
-        
+
         return NULL;
     }
 
@@ -149,14 +149,14 @@ public function getCallback($prefix)
         if ($this->isRegistered($prefix) && !$this->_callbacks[$prefix]['is_fallback']) {
             return $this->_callbacks[$prefix]['callback'];
         }
-        
+
         if ($callback = $this->findUnregisteredCallback($prefix)) {
             return $callback;
         }
-        
+
         if ($this->isRegistered($prefix)) {
             return $this->_callbacks[$prefix]['callback'];
-        }        
+        }
 
         return NULL;
     }

diff --git a/doc/Makefile b/doc/Makefile
@@ -36,12 +36,12 @@ onepageperchapter: $(XHTMLFILES) output_dir
 
 allononepage: $(XHTMLNOCHUNKSFILES) output_dir
 	cp -p -- "$(XHTMLNOCHUNKSFILES)" "$(BUILD)/"
-	
+
 plaintext: $(TXTFILES) output_dir
 	cp -p -- "$(TXTFILES)" "$(BUILD)/phptal.txt"
 
 output_dir:
-	@test -d "$(BUILD)/split" || mkdir -p -- "$(BUILD)/split"	
+	@test -d "$(BUILD)/split" || mkdir -p -- "$(BUILD)/split"
 
 # create temp output directory for current language
 $(TEMP):