FREEMARKER-52: When setting the output_format with Properties, the XHTML abbreviation wasn't recognized. Like in a .properties file, output_format=XHTML didn't work, only output_format=freemarker.core.XHTMLOutputFormat() did.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/017e9f58 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/017e9f58 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/017e9f58 Branch: refs/heads/2.3 Commit: 017e9f58065043066bf3a3f27c8bafb86b55dec2 Parents: 7b35587 Author: ddekany <[email protected]> Authored: Fri May 26 10:07:25 2017 +0200 Committer: ddekany <[email protected]> Committed: Fri May 26 10:07:52 2017 +0200 ---------------------------------------------------------------------- .../core/_ObjectBuilderSettingEvaluator.java | 1 + src/manual/en_US/book.xml | 31 +++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/017e9f58/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java index ed0849d..2f91b55 100644 --- a/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java +++ b/src/main/java/freemarker/core/_ObjectBuilderSettingEvaluator.java @@ -683,6 +683,7 @@ public class _ObjectBuilderSettingEvaluator { addWithSimpleName(SHORTHANDS, FirstMatchTemplateConfigurationFactory.class); addWithSimpleName(SHORTHANDS, HTMLOutputFormat.class); + addWithSimpleName(SHORTHANDS, XHTMLOutputFormat.class); addWithSimpleName(SHORTHANDS, XMLOutputFormat.class); addWithSimpleName(SHORTHANDS, RTFOutputFormat.class); addWithSimpleName(SHORTHANDS, PlainTextOutputFormat.class); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/017e9f58/src/manual/en_US/book.xml ---------------------------------------------------------------------- diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index 3d68c65..a3656d1 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -30,7 +30,7 @@ <titleabbrev>Manual</titleabbrev> - <productname>Freemarker 2.3.26</productname> + <productname>Freemarker 2.3.27</productname> </info> <preface role="index.html" xml:id="preface"> @@ -26840,6 +26840,35 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting> <appendix xml:id="app_versions"> <title>Version history</title> + <section xml:id="versions_2_3_27"> + <title>2.3.27 (incubating at Apache)</title> + + <para>Release date: FIXME</para> + + <para><emphasis role="bold">This is a stable, final + release.</emphasis> The <quote>incubating</quote> suffix is required + by the Apache Software Foundation until the project becomes a fully + accepted (graduated) Apache project.</para> + + <section> + <title>Changes on the Java side</title> + + <itemizedlist> + <listitem> + <para>Bug fixed (<link + xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-52";>FREEMARKER-52</link>): + When setting the <literal>output_format</literal> with + <literal>Properties</literal>, the <literal>XHTML</literal> + abbreviation wasn't recognized. Like in a + <literal>.properties</literal> file, + <literal>output_format=XHTML</literal> didn't work, only + <literal>output_format=freemarker.core.XHTMLOutputFormat()</literal> + did.</para> + </listitem> + </itemizedlist> + </section> + </section> + <section xml:id="versions_2_3_26"> <title>2.3.26 (incubating at Apache)</title>
