http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib
 2.jar/META-INF/taglib.tld
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 
2.jar/META-INF/taglib.tld 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 
2.jar/META-INF/taglib.tld
index ce5d873..5553935 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 
2.jar/META-INF/taglib.tld       
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 
2.jar/META-INF/taglib.tld       
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
index 0cb719e..919f5c6 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
index d58a2d1..4e1c156 100644
--- 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
+++ 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
index 870eae4..fdf9c25 100644
--- 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
+++ 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
index 1616bef..e7a65a9 100644
--- 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
+++ 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
index 7fd620f..b4f2a7b 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh 
b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
index 61cd076..24bd0ee 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out 
b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
index baedcb3..cf0da7e 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh 
b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
index c3105f5..e0d3348 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out 
b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
index f325f85..65be2a0 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl 
b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl
index e604816..80ae292 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out 
b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
index 8f04b99..cd84bd2 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh 
b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
index e1612fe..9b8dbd9 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out 
b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
index 4433d8d..9471ab7 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh 
b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
index 1d9ea95..f9deeae 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out 
b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
index 39fd18a..0420cca 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
index a2ef2db..f7884bb 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
index f60149c..d016072 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
index 1b6f5ad..4904f60 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
index 09752b3..c6bd10d 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
index f8c81c5..52db70b 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
index d044a43..f47e521 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
 
b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
index e39a50e..0df9e33 100644
--- 
a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
+++ 
b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
@@ -5,9 +5,9 @@
 # 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
 
b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
index 904b851..5d2a738 100644
--- 
a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
+++ 
b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
@@ -5,9 +5,9 @@
 # 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh 
b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh
index 24c4a9f..fe9690c 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out 
b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
index 7ae8cc6..717431f 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh 
b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh
index 49dffe9..624950f 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out 
b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
index cffc123..08d0fea 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh 
b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh
index 1ca5e69..9a34ac0 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out 
b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
index ae84ded..25d6155 100644
--- 
a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
+++ 
b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
 
b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
index 537efe2..cffadfb 100644
--- 
a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
+++ 
b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
@@ -5,9 +5,9 @@
 # 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
 
b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
index c8740cf..f879e70 100644
--- 
a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
+++ 
b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
@@ -5,9 +5,9 @@
 # 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
 
b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
index 126f674..cf4c5a4 100644
--- 
a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
+++ 
b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
@@ -5,9 +5,9 @@
 # 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/manual/test.ftlh
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/test.ftlh 
b/src/test/resources/freemarker/manual/test.ftlh
index 833816e..852b82b 100644
--- a/src/test/resources/freemarker/manual/test.ftlh
+++ b/src/test/resources/freemarker/manual/test.ftlh
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java 
b/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
index b4b6dfd..798bcca 100644
--- a/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
+++ b/src/test/resources/freemarker/template/SimpleObjectWrapperTest.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/template/toCache1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/template/toCache1.ftl 
b/src/test/resources/freemarker/template/toCache1.ftl
index 49f4ede..462f1ae 100644
--- a/src/test/resources/freemarker/template/toCache1.ftl
+++ b/src/test/resources/freemarker/template/toCache1.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/template/toCache2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/template/toCache2.ftl 
b/src/test/resources/freemarker/template/toCache2.ftl
index 9d8a1c5..f59424c 100644
--- a/src/test/resources/freemarker/template/toCache2.ftl
+++ b/src/test/resources/freemarker/template/toCache2.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
index 0744732..33a7186 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
index 58b10de..3f7dad5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/beans.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
index ab41e26..50b0423 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
index d736687..11d780f 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
index 7a9af73..8dc1290 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
index 11be5a7..4532027 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
index c092e3a..780d135 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/comment.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
index 53d05b3..d5902e3 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
index ba37de0..8d9d372 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/compress.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
index 6db1069..43c7eed 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
index c8273f6..9180262 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
index d45c533..3a52c46 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/default.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/default.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/default.txt
index 36f5e9b..fd48463 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/default.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/default.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
index aff6329..ccfe5c8 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
index 2ea37e2..26de5ac 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
index a3aea05..c0a5440 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/exception.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
index 6655e11..0ea4395 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
index 7da8d24..bf441d3 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
index 028247a..6089e87 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
index 8314405..acb1f78 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
index a604e86..9736322 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
index db88300..3af1052 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
index 9dc3412..b1072fd 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
index afc2db3..1c62bd5 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
index 5158a4a..8a8d04f 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/if.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/if.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/if.txt
index 56019cb..7c9d1d8 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/if.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/if.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/import.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/import.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/import.txt
index bb59ca6..b51a4f4 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/import.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/import.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/include.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/include.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/include.txt
index fc83a90..8255470 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/include.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/include.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/include2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
index 888d05e..5037260 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
index 4851e0e..fe862e6 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
index 30d00cf..ef1954c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
index 015ce14..dbe5fd0 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
index ecb634c..3b9b76d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/list.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/list.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
index ca01076..05373bd 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
index 52f49f0..cb9e6d4 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
index 5641694..26fc60d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt
index c713195..bc753a1 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/listhash.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
index df0becc..eb265dc 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.20.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
index 653cbe3..937f0ea 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/listhashliteral-ici-2.3.21.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
index 84fc384..2048ac5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/localization.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
index 66ac79a..bd3c87d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/localization.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/logging.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
index e13f02c..bb192ea 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/logging.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
index d7d509d..25c20ac 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/loopvariable.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
index a2fc98a..5aa47ff 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/macros-return.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/macros.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
index 67874e8..680a08e 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/macros.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
index 953786f..1b4e007 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/macros2.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
index 0d24c7a..54ec68d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/multimodels.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/nested.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
index 99a2ab6..bcfb104 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/nested.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
index adeaee0..b8384c7 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/new-allowsnothing.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
index 5d50e10..2ea00fa 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/new-defaultresolver.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
----------------------------------------------------------------------
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
index dfbad74..9d8e883 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/new-optin.txt
@@ -6,9 +6,9 @@
  * 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


Reply via email to