http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl
deleted file mode 100644
index a8c8d54..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl
+++ /dev/null
@@ -1,100 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<head>
-<title>FreeMarker: Function Test</title>
-</head>
-<body>
-
-<p>A simple test follows:</p>
-
-<p>${message}</p>
-
-<p>Now perform function tests:</p>
-
-<#assign urls = {"home" : "/home.html", "about" : "/about.html"}>
-<#assign images = {"home" : "/images/home.png", "about" : 
"/image/about-us.jpeg"}>
-<#assign preferences = {"showImages" : true}>
-<#assign español = français><#macro français url image alt>
-    <#local var = "Kilroy">
-    <a href="${url}">
-    <#if preferences.showImages>
-        <img src="${image}" border="0" alt="${alt}">
-    <#else>
-        ${alt}
-    </#if>
-    </a>
-    ${var} was here.
-</#macro>
-
-<p>Function is defined, now let's call it:</p>
-
-   <@español url=urls.home image=images.home alt="Home" /><#t>
-
-<p>Again, but with different parameters:</p>
-
-<@français 
-   url=urls.about 
-   image=images.about 
-   alt="About Us"
-/>
-
-<#if var??>
-   Something is wrong here.
-<#else>
-   Good.
-</#if>
-
-<p>A recursive function call:</p>
-
-<#macro recurse dummy{positional}, a{positional}=3>
-    <#if (a > 0)>
-        <@recurse dummy, a - 1 />
-    </#if>
-    ${a}
-</#macro>
-
-<@recurse urls />
-
-<p>Test "catch-all" macro parameter:</p>
-
-<#macro catch\-all foo bar...>
-foo=${foo} bar=[<#list bar as k, v>${k}=${v}<#sep>, </#list>]
-</#macro>
-<#assign catchall = .namespace["catch-all"]>
-
-<@catchall foo="a"/>
-<@catchall foo="a" bar="b"/>
-<@catchall foo="a" bar="b" baz="c"/>
-
-<#macro fmt pattern{positional} args...>
-  <#list args as k, v>
-    <#local pattern = pattern?replace("{" + k + "}", v)>
-  </#list>
-  ${pattern}<#lt>
-</#macro>
-
-<#macro m a=1 b=2></#macro>
-<@assertFails message='"c"'><@m c=3 /></@>
-<@assertFails message='position'><@m 1, 2 /></@>
-
-<@fmt "Hello {name}! Today is {today}." name="World" today="Monday" />
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/multimodels.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/multimodels.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/multimodels.f3ac
new file mode 100644
index 0000000..23089c0
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/multimodels.f3ac
@@ -0,0 +1,84 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<head>
+<title>FreeMarker: Test of Multiple Model implementations</title>
+</head>
+<body>
+
+<p>Let's begin with a simple model:</p>
+<p>${message}</p>
+
+<p>Cool, now get into the first model. This implements a string, list, and
+hash as a single class. Let's try some tests...</p>
+
+<p>${data}</p>
+
+<p>Now as a list...</p>
+
+<#list data as item>${item}<br />
+</#list>
+
+<p>Index into a list...</p>
+<p>${data[ 1 ]}</p>
+<p>List size is: ${data.size}</p>
+<p>List size is: ${data["size"]}</p>
+
+<p>Now, again, as a hash. First using dot notation, then using [] notation:</p>
+
+<p>${data.selftest}</p>
+<p>${data["selftest"]}</p>
+
+<p>Now for the tricky stuff... use a model to index into another model...</p>
+<p>${test}</p>
+<p>${data[ test ]}</p>
+<p>${self}</p>
+<p>${data[ self + "test" ]}</p>
+
+<p>Same thing, this time a List index...</p>
+<p>${zero}</p>
+<p>${data[ zero ]}</p>
+<p>${data[ zero + 1 ]}</p>
+
+<p>Now, do the same recursively...</p>
+<p>${data}</p>
+<p>${data.model2}</p>
+<p>${data.model2( "test" )}</p>
+<p>${data.model2( data, data.selftest, message )}</p>
+
+<p>Does this really not work?</p>
+<p>${data[ 10 ]}</p>
+<p>${data[ 10 ].selftest}</p>
+<p>${data[ 10 ].message}</p>
+
+<p>(Again, with Hashes)</p>
+<p>${data.nesting1.nested}</p>
+<p>${data.nesting1.nested.selftest}</p>
+
+<p>${data["nesting1"].nested}</p>
+<p>${data["nesting1"].nested["selftest"]}</p>
+<p>${data["nesting1"]["nested"]["selftest"]}</p>
+
+<p>As I suspected! (Manual on Expressions needs updating.)</p>
+
+<p>Second test on list size</p>
+<p>${data.one.size}</p>
+<p>${data.one["size"]}</p>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/multimodels.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/multimodels.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/multimodels.ftl
deleted file mode 100644
index 23089c0..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/multimodels.ftl
+++ /dev/null
@@ -1,84 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<head>
-<title>FreeMarker: Test of Multiple Model implementations</title>
-</head>
-<body>
-
-<p>Let's begin with a simple model:</p>
-<p>${message}</p>
-
-<p>Cool, now get into the first model. This implements a string, list, and
-hash as a single class. Let's try some tests...</p>
-
-<p>${data}</p>
-
-<p>Now as a list...</p>
-
-<#list data as item>${item}<br />
-</#list>
-
-<p>Index into a list...</p>
-<p>${data[ 1 ]}</p>
-<p>List size is: ${data.size}</p>
-<p>List size is: ${data["size"]}</p>
-
-<p>Now, again, as a hash. First using dot notation, then using [] notation:</p>
-
-<p>${data.selftest}</p>
-<p>${data["selftest"]}</p>
-
-<p>Now for the tricky stuff... use a model to index into another model...</p>
-<p>${test}</p>
-<p>${data[ test ]}</p>
-<p>${self}</p>
-<p>${data[ self + "test" ]}</p>
-
-<p>Same thing, this time a List index...</p>
-<p>${zero}</p>
-<p>${data[ zero ]}</p>
-<p>${data[ zero + 1 ]}</p>
-
-<p>Now, do the same recursively...</p>
-<p>${data}</p>
-<p>${data.model2}</p>
-<p>${data.model2( "test" )}</p>
-<p>${data.model2( data, data.selftest, message )}</p>
-
-<p>Does this really not work?</p>
-<p>${data[ 10 ]}</p>
-<p>${data[ 10 ].selftest}</p>
-<p>${data[ 10 ].message}</p>
-
-<p>(Again, with Hashes)</p>
-<p>${data.nesting1.nested}</p>
-<p>${data.nesting1.nested.selftest}</p>
-
-<p>${data["nesting1"].nested}</p>
-<p>${data["nesting1"].nested["selftest"]}</p>
-<p>${data["nesting1"]["nested"]["selftest"]}</p>
-
-<p>As I suspected! (Manual on Expressions needs updating.)</p>
-
-<p>Second test on list size</p>
-<p>${data.one.size}</p>
-<p>${data.one["size"]}</p>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nested.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nested.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nested.f3ac
new file mode 100644
index 0000000..8c991b4
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nested.f3ac
@@ -0,0 +1,29 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<#macro repeat count>
+  <#local y = "test">
+  <#list 1..count as x>
+    ${y} ${count}/${x}: <#nested x, "asdf"> <#-- the second body parameter is 
not used below -->
+  </#list>
+</#macro>
+<@repeat count=3>${y!"undefined"} ${x!"undefined"} 
${count!"undefined"}</@repeat>
+<#global x = "X">
+<#global y = "Y">
+<#global count = "Count">
+<@repeat count=3 ; param1>${y!"undefined"} ${x!"undefined"} 
${count!"undefined"} ${param1}</@repeat>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nested.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nested.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nested.ftl
deleted file mode 100644
index 8c991b4..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nested.ftl
+++ /dev/null
@@ -1,29 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<#macro repeat count>
-  <#local y = "test">
-  <#list 1..count as x>
-    ${y} ${count}/${x}: <#nested x, "asdf"> <#-- the second body parameter is 
not used below -->
-  </#list>
-</#macro>
-<@repeat count=3>${y!"undefined"} ${x!"undefined"} 
${count!"undefined"}</@repeat>
-<#global x = "X">
-<#global y = "Y">
-<#global count = "Count">
-<@repeat count=3 ; param1>${y!"undefined"} ${x!"undefined"} 
${count!"undefined"} ${param1}</@repeat>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nestedinclude.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nestedinclude.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nestedinclude.f3ac
new file mode 100644
index 0000000..c6e7b11
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nestedinclude.f3ac
@@ -0,0 +1,21 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<#assign nestedMessage = "I'm here, mon!">
+${.main.bar}
+<#-- ${.root.message} -->

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nestedinclude.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nestedinclude.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nestedinclude.ftl
deleted file mode 100644
index c6e7b11..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/nestedinclude.ftl
+++ /dev/null
@@ -1,21 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<#assign nestedMessage = "I'm here, mon!">
-${.main.bar}
-<#-- ${.root.message} -->

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-defaultresolver.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-defaultresolver.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-defaultresolver.f3ac
new file mode 100644
index 0000000..04b6665
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-defaultresolver.f3ac
@@ -0,0 +1,23 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<#attempt>
+${"org.apache.freemarker.core.templatesuite.models.NewTestModel"?new("works")}
+<#recover>
+fails
+</#attempt>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-defaultresolver.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-defaultresolver.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-defaultresolver.ftl
deleted file mode 100644
index 04b6665..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-defaultresolver.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<#attempt>
-${"org.apache.freemarker.core.templatesuite.models.NewTestModel"?new("works")}
-<#recover>
-fails
-</#attempt>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-optin.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-optin.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-optin.f3ac
new file mode 100644
index 0000000..3e4fcec
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-optin.f3ac
@@ -0,0 +1,30 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+${"org.apache.freemarker.core.templatesuite.models.NewTestModel"?new("works")}
+<#attempt>
+${"org.apache.freemarker.core.templatesuite.models.NewTestModel2"?new("works")}
+<#recover>
+fails
+</#attempt>
+
+<#include "subdir/new-optin.f3ac">
+
+<#include "subdir/new-optin-2.f3ac">
+
+<#include "subdir/subsub/new-optin.f3ac">
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-optin.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-optin.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-optin.ftl
deleted file mode 100644
index a2cd276..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/new-optin.ftl
+++ /dev/null
@@ -1,30 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-${"org.apache.freemarker.core.templatesuite.models.NewTestModel"?new("works")}
-<#attempt>
-${"org.apache.freemarker.core.templatesuite.models.NewTestModel2"?new("works")}
-<#recover>
-fails
-</#attempt>
-
-<#include "subdir/new-optin.ftl">
-
-<#include "subdir/new-optin-2.ftl">
-
-<#include "subdir/subsub/new-optin.ftl">
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.f3ac
new file mode 100644
index 0000000..d9e6438
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.f3ac
@@ -0,0 +1,62 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<head>
+<title>FreeMarker: NoParse Test</title>
+</head>
+<body>
+<#noParse>
+
+A simple test follows:
+
+${message}
+
+A more rigorous test, showing that we're not faking it:
+
+${message@#$%&}
+
+</#noParse>
+<#if message??>
+       <p>Message exists!
+       <#noParse>
+               ...and even generates output!
+               <#if message>
+                       Nested statements are ok, too.
+               </#if>
+       </#noParse>
+       </p>
+</#if>
+
+Here's another edge case, this time, trying to output a &lt;noParse&gt;
+inside another &lt;noParse&gt;
+
+<#noParse>
+
+This is what the noParse instruction looks like:
+
+<#noP</#noParse><#noParse>arse>This part of the template wont be parsed by the
+FreeMarker parser. Instead, it will be treated as verbatim text information,
+and output as such.</#noP</#noParse><#noParse>arse>
+
+The rest of the template appears here.
+</#noParse>
+
+Simple.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl
deleted file mode 100644
index d9e6438..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl
+++ /dev/null
@@ -1,62 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<head>
-<title>FreeMarker: NoParse Test</title>
-</head>
-<body>
-<#noParse>
-
-A simple test follows:
-
-${message}
-
-A more rigorous test, showing that we're not faking it:
-
-${message@#$%&}
-
-</#noParse>
-<#if message??>
-       <p>Message exists!
-       <#noParse>
-               ...and even generates output!
-               <#if message>
-                       Nested statements are ok, too.
-               </#if>
-       </#noParse>
-       </p>
-</#if>
-
-Here's another edge case, this time, trying to output a &lt;noParse&gt;
-inside another &lt;noParse&gt;
-
-<#noParse>
-
-This is what the noParse instruction looks like:
-
-<#noP</#noParse><#noParse>arse>This part of the template wont be parsed by the
-FreeMarker parser. Instead, it will be treated as verbatim text information,
-and output as such.</#noP</#noParse><#noParse>arse>
-
-The rest of the template appears here.
-</#noParse>
-
-Simple.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.f3ac
new file mode 100644
index 0000000..4c8e627
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.f3ac
@@ -0,0 +1,42 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<#setting numberFormat = ",##0.##">
+<#setting locale = "fr_FR">
+${1}
+${1?c}
+${1234567.886}
+${1234567.886?c}
+<#setting numberFormat = "0.00">
+${1}
+${1?c}
+${1234567.886}
+${1234567.886?c}
+${int?c}
+${double?c}
+${double2?c}
+${double3?c}
+${double4?c}
+${bigDecimal?c}
+${bigDecimal2?c}
+<@assertEquals expected="INF" actual="INF"?number?c />
+<@assertEquals expected="INF" actual="INF"?number?c />
+<@assertEquals expected="-INF" actual="-INF"?number?c />
+<@assertEquals expected="-INF" actual="-INF"?number?float?c />
+<@assertEquals expected="NaN" actual="NaN"?number?float?c />
+<@assertEquals expected="NaN" actual="NaN"?number?float?c />

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl
deleted file mode 100644
index 4c8e627..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl
+++ /dev/null
@@ -1,42 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<#setting numberFormat = ",##0.##">
-<#setting locale = "fr_FR">
-${1}
-${1?c}
-${1234567.886}
-${1234567.886?c}
-<#setting numberFormat = "0.00">
-${1}
-${1?c}
-${1234567.886}
-${1234567.886?c}
-${int?c}
-${double?c}
-${double2?c}
-${double3?c}
-${double4?c}
-${bigDecimal?c}
-${bigDecimal2?c}
-<@assertEquals expected="INF" actual="INF"?number?c />
-<@assertEquals expected="INF" actual="INF"?number?c />
-<@assertEquals expected="-INF" actual="-INF"?number?c />
-<@assertEquals expected="-INF" actual="-INF"?number?float?c />
-<@assertEquals expected="NaN" actual="NaN"?number?float?c />
-<@assertEquals expected="NaN" actual="NaN"?number?float?c />

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.f3ac
new file mode 100644
index 0000000..348d33b
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.f3ac
@@ -0,0 +1,133 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<html>
+<head>
+<title>FreeMarker: Number Literal Test</title>
+</head>
+<body>
+<#assign hash = {"1" : "one", 
+                 "12" : "twelve", 
+                "2one" : "two-one", 
+                "one2" : "one-two"}
+         list = ["zero", 
+                 "one", 
+                 "two", 
+                 "three", 
+                 "four", 
+                 "five", 
+                 "six", 
+                 "seven", 
+                 "eight", 
+                 "nine", 
+                 "ten",
+                 "eleven",
+                 "twelve"],
+          foo = "bar",
+          one = "one",
+          "1" = "one",
+          "12" = "twelve",
+          "2one" = "two-one",
+          one2 = "one-two",
+          call = 
"org.apache.freemarker.core.templatesuite.models.SimpleTestFunction"?new()
+>
+
+<p>A simple test follows:</p>
+
+<p>${message}</p>
+
+<p>Now perform a number assignment:</p>
+
+${1.300000?double}
+
+<#assign mynumber = 1.8, USA="en_US" />
+<#assign myfloat = mynumber?float />
+
+My number is: ${mynumber}
+<#setting locale="en_US">
+My float is: ${myfloat?string('0.000000')}
+The int part is: ${myfloat?int}
+
+<#assign mymessage = mynumber?string>
+
+${mymessage + 3}
+
+<p>Now use numbers in assignment</p>
+
+<#assign mymessage = 1 + 5>
+${mymessage}
+
+<#assign mymessage = mymessage + 2>
+${mymessage}
+
+<p>Try numbers in tests</p>
+
+<#if (mymessage == 152)>
+MyMessage is 152
+<#else>
+MyMessage is not 152, its: ${mymessage}.
+</#if >
+
+<if (mymessage > 5)>
+   MyMessage is greater than five.
+</if
+
+<#switch mymessage>
+       <#case 1>
+               MyMessage is one
+               <#break>
+
+       <#case 15>
+               MyMessage is fifteen
+               <#break>
+       
+       <#case 152>
+               MyMessage is one-five-two
+               <#break>
+       
+       <#default>
+               MyMessage is: ${mymessage}.
+               <#break>
+       
+</#switch>
+
+<p>Now for numbers in dynamic keys:</p>
+
+<#assign one = 1>
+<#assign two = 2>
+
+${list[ 1 ]}
+${list[ 1 + 2 ]}
+
+<p>Numbers in hashes:</p>
+
+${hash[ 1 + "2" ]}
+${hash[ "1" + 2 ]}
+${hash[ "1" + two ]}
+
+
+<p>Numbers in method calls:</p>
+
+${call( 1 )}
+${call( one )}
+${call( one + "2" )}
+${call( one + 2 )}
+${call( 1 + 2 )}
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl
deleted file mode 100644
index 348d33b..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl
+++ /dev/null
@@ -1,133 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html>
-<head>
-<title>FreeMarker: Number Literal Test</title>
-</head>
-<body>
-<#assign hash = {"1" : "one", 
-                 "12" : "twelve", 
-                "2one" : "two-one", 
-                "one2" : "one-two"}
-         list = ["zero", 
-                 "one", 
-                 "two", 
-                 "three", 
-                 "four", 
-                 "five", 
-                 "six", 
-                 "seven", 
-                 "eight", 
-                 "nine", 
-                 "ten",
-                 "eleven",
-                 "twelve"],
-          foo = "bar",
-          one = "one",
-          "1" = "one",
-          "12" = "twelve",
-          "2one" = "two-one",
-          one2 = "one-two",
-          call = 
"org.apache.freemarker.core.templatesuite.models.SimpleTestFunction"?new()
->
-
-<p>A simple test follows:</p>
-
-<p>${message}</p>
-
-<p>Now perform a number assignment:</p>
-
-${1.300000?double}
-
-<#assign mynumber = 1.8, USA="en_US" />
-<#assign myfloat = mynumber?float />
-
-My number is: ${mynumber}
-<#setting locale="en_US">
-My float is: ${myfloat?string('0.000000')}
-The int part is: ${myfloat?int}
-
-<#assign mymessage = mynumber?string>
-
-${mymessage + 3}
-
-<p>Now use numbers in assignment</p>
-
-<#assign mymessage = 1 + 5>
-${mymessage}
-
-<#assign mymessage = mymessage + 2>
-${mymessage}
-
-<p>Try numbers in tests</p>
-
-<#if (mymessage == 152)>
-MyMessage is 152
-<#else>
-MyMessage is not 152, its: ${mymessage}.
-</#if >
-
-<if (mymessage > 5)>
-   MyMessage is greater than five.
-</if
-
-<#switch mymessage>
-       <#case 1>
-               MyMessage is one
-               <#break>
-
-       <#case 15>
-               MyMessage is fifteen
-               <#break>
-       
-       <#case 152>
-               MyMessage is one-five-two
-               <#break>
-       
-       <#default>
-               MyMessage is: ${mymessage}.
-               <#break>
-       
-</#switch>
-
-<p>Now for numbers in dynamic keys:</p>
-
-<#assign one = 1>
-<#assign two = 2>
-
-${list[ 1 ]}
-${list[ 1 + 2 ]}
-
-<p>Numbers in hashes:</p>
-
-${hash[ 1 + "2" ]}
-${hash[ "1" + 2 ]}
-${hash[ "1" + two ]}
-
-
-<p>Numbers in method calls:</p>
-
-${call( 1 )}
-${call( one )}
-${call( one + "2" )}
-${call( one + 2 )}
-${call( 1 + 2 )}
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.f3ac
new file mode 100644
index 0000000..2951f6e
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.f3ac
@@ -0,0 +1,78 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<@assertEquals actual=0?abs expected=0 />
+<@assertEquals actual=3?abs expected=3 />
+<@assertEquals actual=(-3)?abs expected=3 />
+<@assertEquals actual=3.5?abs expected=3.5 />
+<@assertEquals actual=(-3.5)?abs expected=3.5 />
+
+<@assert fNan?abs?isNan />
+<@assert dNan?abs?isNan />
+<@assert fNinf?abs?isInfinite />
+<@assert dPinf?abs?isInfinite />
+<@assert fNinf lt 0 />
+<@assert dPinf gt 0 />
+<@assert fNinf?abs gt 0 />
+<@assert dPinf?abs gt 0 />
+
+<@assertEquals actual=fn?abs expected=0.05 />
+<@assertEquals actual=dn?abs expected=0.05 />
+<@assertEquals actual=ineg?abs expected=5 />
+<@assertEquals actual=ln?abs expected=5 />
+<@assertEquals actual=sn?abs expected=5 />
+<@assertEquals actual=bn?abs expected=5 />
+<@assertEquals actual=bin?abs expected=5 />
+<@assertEquals actual=bdn?abs expected=0.05 />
+
+<@assertEquals actual=fp?abs expected=0.05 />
+<@assertEquals actual=dp?abs expected=0.05 />
+<@assertEquals actual=ip?abs expected=5 />
+<@assertEquals actual=lp?abs expected=5 />
+<@assertEquals actual=sp?abs expected=5 />
+<@assertEquals actual=bp?abs expected=5 />
+<@assertEquals actual=bip?abs expected=5 />
+<@assertEquals actual=bdp?abs expected=0.05 />
+
+<@assert !0?isInfinite />
+<@assert !fn?isInfinite />
+<@assert !dn?isInfinite />
+<@assert !ineg?isInfinite />
+<@assert !ln?isInfinite />
+<@assert !sn?isInfinite />
+<@assert !bn?isInfinite />
+<@assert !bin?isInfinite />
+<@assert !bdn?isInfinite />
+<@assert !fNan?isInfinite />
+<@assert !dNan?isInfinite />
+<@assert fNinf?isInfinite />
+<@assert dPinf?isInfinite />
+
+<@assert !0?isNan />
+<@assert !fn?isNan />
+<@assert !dn?isNan />
+<@assert !ineg?isNan />
+<@assert !ln?isNan />
+<@assert !sn?isNan />
+<@assert !bn?isNan />
+<@assert !bin?isNan />
+<@assert !bdn?isNan />
+<@assert fNan?isNan />
+<@assert dNan?isNan />
+<@assert !fNinf?isNan />
+<@assert !dPinf?isNan />
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl
deleted file mode 100644
index 2951f6e..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl
+++ /dev/null
@@ -1,78 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<@assertEquals actual=0?abs expected=0 />
-<@assertEquals actual=3?abs expected=3 />
-<@assertEquals actual=(-3)?abs expected=3 />
-<@assertEquals actual=3.5?abs expected=3.5 />
-<@assertEquals actual=(-3.5)?abs expected=3.5 />
-
-<@assert fNan?abs?isNan />
-<@assert dNan?abs?isNan />
-<@assert fNinf?abs?isInfinite />
-<@assert dPinf?abs?isInfinite />
-<@assert fNinf lt 0 />
-<@assert dPinf gt 0 />
-<@assert fNinf?abs gt 0 />
-<@assert dPinf?abs gt 0 />
-
-<@assertEquals actual=fn?abs expected=0.05 />
-<@assertEquals actual=dn?abs expected=0.05 />
-<@assertEquals actual=ineg?abs expected=5 />
-<@assertEquals actual=ln?abs expected=5 />
-<@assertEquals actual=sn?abs expected=5 />
-<@assertEquals actual=bn?abs expected=5 />
-<@assertEquals actual=bin?abs expected=5 />
-<@assertEquals actual=bdn?abs expected=0.05 />
-
-<@assertEquals actual=fp?abs expected=0.05 />
-<@assertEquals actual=dp?abs expected=0.05 />
-<@assertEquals actual=ip?abs expected=5 />
-<@assertEquals actual=lp?abs expected=5 />
-<@assertEquals actual=sp?abs expected=5 />
-<@assertEquals actual=bp?abs expected=5 />
-<@assertEquals actual=bip?abs expected=5 />
-<@assertEquals actual=bdp?abs expected=0.05 />
-
-<@assert !0?isInfinite />
-<@assert !fn?isInfinite />
-<@assert !dn?isInfinite />
-<@assert !ineg?isInfinite />
-<@assert !ln?isInfinite />
-<@assert !sn?isInfinite />
-<@assert !bn?isInfinite />
-<@assert !bin?isInfinite />
-<@assert !bdn?isInfinite />
-<@assert !fNan?isInfinite />
-<@assert !dNan?isInfinite />
-<@assert fNinf?isInfinite />
-<@assert dPinf?isInfinite />
-
-<@assert !0?isNan />
-<@assert !fn?isNan />
-<@assert !dn?isNan />
-<@assert !ineg?isNan />
-<@assert !ln?isNan />
-<@assert !sn?isNan />
-<@assert !bn?isNan />
-<@assert !bin?isNan />
-<@assert !bdn?isNan />
-<@assert fNan?isNan />
-<@assert dNan?isNan />
-<@assert !fNinf?isNan />
-<@assert !dPinf?isNan />
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.f3ac
new file mode 100644
index 0000000..91b29e0
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.f3ac
@@ -0,0 +1,35 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+${1305575275540?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
+${1305575275540?numberToDate?isoUtc} == 2011-05-16
+${1305575275540?numberToTime?isoUtcMs} == 19:47:55.54Z
+
+${1305575275540?long?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
+${1305575275540?double?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
+${bigInteger?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
+${bigDecimal?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
+${1000?float?numberToDatetime?isoUtc} == 1970-01-01T00:00:01Z
+${1000?int?numberToDatetime?isoUtc} == 1970-01-01T00:00:01Z
+${0?byte?numberToDatetime?isoUtc} == 1970-01-01T00:00:00Z
+
+<#attempt>
+${9999991305575275540?numberToDatetime?isoUtc} <#-- doesn't fit into long -->
+<#recover>
+failed
+</#attempt>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl
deleted file mode 100644
index 91b29e0..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl
+++ /dev/null
@@ -1,35 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-${1305575275540?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
-${1305575275540?numberToDate?isoUtc} == 2011-05-16
-${1305575275540?numberToTime?isoUtcMs} == 19:47:55.54Z
-
-${1305575275540?long?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
-${1305575275540?double?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
-${bigInteger?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
-${bigDecimal?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z
-${1000?float?numberToDatetime?isoUtc} == 1970-01-01T00:00:01Z
-${1000?int?numberToDatetime?isoUtc} == 1970-01-01T00:00:01Z
-${0?byte?numberToDatetime?isoUtc} == 1970-01-01T00:00:00Z
-
-<#attempt>
-${9999991305575275540?numberToDatetime?isoUtc} <#-- doesn't fit into long -->
-<#recover>
-failed
-</#attempt>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.f3ac
new file mode 100644
index 0000000..37ae7e1
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.f3ac
@@ -0,0 +1,82 @@
+<#ftl>
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<#setting locale="en_US">
+<#setting numberFormat="0.#########">
+
+<#assign testlist= [ 0, 1, -1, 0.5, 1.5, -0.5,
+        -1.5, 0.25, -0.25, 1.75, -1.75,
+        1.01, -1.01, 0.01, -0.01,
+        127, 128, -127, -128,
+        32767, 32768, -32767, -32768,
+        2147483647, 2147483648, -2147483647, -2147483648,
+        4294967295, 4294967296, -4294967295, -4294967296,
+        2147483647.1, 2147483648.1, -2147483647.1, -2147483648.1,
+        4294967295.1, 4294967296.1, -4294967295.1, -4294967296.1,
+        2147483647.5, 2147483648.5, -2147483647.5, -2147483648.5,
+        4294967295.5, 4294967296.5, -4294967295.5, -4294967296.5
+  ] />
+
+?int:
+<#list testlist as result>
+    ${result}?int=${result?int}
+</#list>
+
+?double
+<#list testlist as result>
+    ${result}?double=${result?double}
+</#list>
+
+?long
+<#list testlist as result>
+    ${result}?long=${result?long}
+</#list>
+
+?long from date
+    ${"2011-05-08 18:00:15 GMT"?date("yyyy-MM-dd HH:mm:ss z")?long} = 
1304877615000
+
+?float
+<#list testlist as result>
+    ${result}?float=${result?float}
+</#list>
+
+?byte
+<#list testlist as result>
+    ${result}?byte=${result?byte}
+</#list>
+
+?short
+<#list testlist as result>
+    ${result}?short=${result?short}
+</#list>
+
+?floor
+<#list testlist as result>
+    ${result}?floor=${result?floor}
+</#list>
+
+?ceiling
+<#list testlist as result>
+    ${result}?ceiling=${result?ceiling}
+</#list>
+
+?round
+<#list testlist as result>
+    ${result}?round=${result?round}
+</#list>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl
deleted file mode 100644
index 37ae7e1..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl
+++ /dev/null
@@ -1,82 +0,0 @@
-<#ftl>
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<#setting locale="en_US">
-<#setting numberFormat="0.#########">
-
-<#assign testlist= [ 0, 1, -1, 0.5, 1.5, -0.5,
-        -1.5, 0.25, -0.25, 1.75, -1.75,
-        1.01, -1.01, 0.01, -0.01,
-        127, 128, -127, -128,
-        32767, 32768, -32767, -32768,
-        2147483647, 2147483648, -2147483647, -2147483648,
-        4294967295, 4294967296, -4294967295, -4294967296,
-        2147483647.1, 2147483648.1, -2147483647.1, -2147483648.1,
-        4294967295.1, 4294967296.1, -4294967295.1, -4294967296.1,
-        2147483647.5, 2147483648.5, -2147483647.5, -2147483648.5,
-        4294967295.5, 4294967296.5, -4294967295.5, -4294967296.5
-  ] />
-
-?int:
-<#list testlist as result>
-    ${result}?int=${result?int}
-</#list>
-
-?double
-<#list testlist as result>
-    ${result}?double=${result?double}
-</#list>
-
-?long
-<#list testlist as result>
-    ${result}?long=${result?long}
-</#list>
-
-?long from date
-    ${"2011-05-08 18:00:15 GMT"?date("yyyy-MM-dd HH:mm:ss z")?long} = 
1304877615000
-
-?float
-<#list testlist as result>
-    ${result}?float=${result?float}
-</#list>
-
-?byte
-<#list testlist as result>
-    ${result}?byte=${result?byte}
-</#list>
-
-?short
-<#list testlist as result>
-    ${result}?short=${result?short}
-</#list>
-
-?floor
-<#list testlist as result>
-    ${result}?floor=${result?floor}
-</#list>
-
-?ceiling
-<#list testlist as result>
-    ${result}?ceiling=${result?ceiling}
-</#list>
-
-?round
-<#list testlist as result>
-    ${result}?round=${result?round}
-</#list>

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.f3ac
new file mode 100644
index 0000000..b309fa0
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.f3ac
@@ -0,0 +1,30 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+Output charset: ${.outputEncoding!"undefined"}
+URL escaping charset: ${.urlEscapingCharset!"undefined"}
+
+<#assign s="a/%b">
+<#setting urlEscapingCharset="UTF-16">
+${s?url}
+${s?url}
+<#setting urlEscapingCharset="ISO-8859-1">
+${s?url}
+${s?url}
+${s?url('UTF-16')}
+${s?url}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl
deleted file mode 100644
index b309fa0..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl
+++ /dev/null
@@ -1,30 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-Output charset: ${.outputEncoding!"undefined"}
-URL escaping charset: ${.urlEscapingCharset!"undefined"}
-
-<#assign s="a/%b">
-<#setting urlEscapingCharset="UTF-16">
-${s?url}
-${s?url}
-<#setting urlEscapingCharset="ISO-8859-1">
-${s?url}
-${s?url}
-${s?url('UTF-16')}
-${s?url}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.f3ac
new file mode 100644
index 0000000..83eae70
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.f3ac
@@ -0,0 +1,28 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+Output charset: ${.outputEncoding!"undefined"}
+URL escaping charset: ${.urlEscapingCharset!"undefined"}
+
+<#assign s="a/%b">
+UTF-16: ${s?url}
+ISO-8859-1: ${s?url('ISO-8859-1')}
+UTF-16: ${s?url}
+<#setting urlEscapingCharset="ISO-8859-1">
+ISO-8859-1: ${s?url}
+ISO-8859-1: ${s?url}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl
deleted file mode 100644
index 83eae70..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl
+++ /dev/null
@@ -1,28 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-Output charset: ${.outputEncoding!"undefined"}
-URL escaping charset: ${.urlEscapingCharset!"undefined"}
-
-<#assign s="a/%b">
-UTF-16: ${s?url}
-ISO-8859-1: ${s?url('ISO-8859-1')}
-UTF-16: ${s?url}
-<#setting urlEscapingCharset="ISO-8859-1">
-ISO-8859-1: ${s?url}
-ISO-8859-1: ${s?url}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.f3ac
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.f3ac
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.f3ac
new file mode 100644
index 0000000..83eae70
--- /dev/null
+++ 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.f3ac
@@ -0,0 +1,28 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+Output charset: ${.outputEncoding!"undefined"}
+URL escaping charset: ${.urlEscapingCharset!"undefined"}
+
+<#assign s="a/%b">
+UTF-16: ${s?url}
+ISO-8859-1: ${s?url('ISO-8859-1')}
+UTF-16: ${s?url}
+<#setting urlEscapingCharset="ISO-8859-1">
+ISO-8859-1: ${s?url}
+ISO-8859-1: ${s?url}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/freemarker/blob/81b48221/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl
----------------------------------------------------------------------
diff --git 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl
 
b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl
deleted file mode 100644
index 83eae70..0000000
--- 
a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl
+++ /dev/null
@@ -1,28 +0,0 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-Output charset: ${.outputEncoding!"undefined"}
-URL escaping charset: ${.urlEscapingCharset!"undefined"}
-
-<#assign s="a/%b">
-UTF-16: ${s?url}
-ISO-8859-1: ${s?url('ISO-8859-1')}
-UTF-16: ${s?url}
-<#setting urlEscapingCharset="ISO-8859-1">
-ISO-8859-1: ${s?url}
-ISO-8859-1: ${s?url}
\ No newline at end of file

Reply via email to