svn commit: r736087 - in /velocity/engine/trunk/src: java/org/apache/velocity/runtime/parser/Parser.java parser/Parser.jjt

[byron]

Author: byron
Date: Tue Jan 20 12:15:23 2009
New Revision: 736087

URL: http://svn.apache.org/viewvc?rev=736087&view=rev
Log:
VELOCITY-669 preserve consistent escape behavior with global macros

Modified:
    
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
    velocity/engine/trunk/src/parser/Parser.jjt

Modified: 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java?rev=736087&r1=736086&r2=736087&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java 
(original)
+++ 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java 
Tue Jan 20 12:15:23 2009
@@ -194,7 +194,7 @@
         {
            bRecognizedDirective = true;
         }
-        else if (macroNames.containsKey(dirTag))
+        else if (macroNames.containsKey(dirTag) || rsvc.isVelocimacro(dirTag, 
currentTemplateName))
         {
             bRecognizedDirective = true;
         }

Modified: velocity/engine/trunk/src/parser/Parser.jjt
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/parser/Parser.jjt?rev=736087&r1=736086&r2=736087&view=diff
==============================================================================
--- velocity/engine/trunk/src/parser/Parser.jjt (original)
+++ velocity/engine/trunk/src/parser/Parser.jjt Tue Jan 20 12:15:23 2009
@@ -271,7 +271,7 @@
         {
            bRecognizedDirective = true;
         }
-        else if (macroNames.containsKey(dirTag))
+        else if (macroNames.containsKey(dirTag) || rsvc.isVelocimacro(dirTag, 
currentTemplateName))
         {
             bRecognizedDirective = true;
         }