Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/9c8f7ab7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9c8f7ab7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/9c8f7ab7 Branch: refs/heads/2.3 Commit: 9c8f7ab74bc003b97fb2345604f666ee22d0cd72 Parents: 49ab712 7adecae Author: ddekany <ddek...@apache.org> Authored: Fri Mar 9 22:47:25 2018 +0100 Committer: ddekany <ddek...@apache.org> Committed: Fri Mar 9 22:47:25 2018 +0100 ---------------------------------------------------------------------- .../java/freemarker/core/BuiltinVariable.java | 15 ++ .../freemarker/core/DirectiveCallPlace.java | 16 +- src/main/java/freemarker/core/Environment.java | 35 ++++- .../core/GetOptionalTemplateMethod.java | 4 +- src/main/java/freemarker/core/Macro.java | 6 +- .../java/freemarker/core/TemplateObject.java | 4 - src/main/java/freemarker/core/UnifiedCall.java | 2 +- .../java/freemarker/template/Configuration.java | 14 ++ .../java/freemarker/template/_TemplateAPI.java | 1 + .../freemarker/template/utility/DeepUnwrap.java | 26 ++- src/manual/en_US/book.xml | 93 +++++++++-- .../freemarker/core/DirectiveCallPlaceTest.java | 6 +- .../core/GetOptionalTemplateTest.java | 14 +- .../core/MacroCallerTemplateNameTest.java | 157 +++++++++++++++++++ .../core/TemplateNameSpecialVariablesTest.java | 56 +++++++ .../template/utility/DeepUnwrapTest.java | 92 +++++++++++ 16 files changed, 493 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
