freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [12/35] incubator-freemarker git commit: XHTML output format is now available by "XHTML" name by default
Date Wed, 30 Dec 2015 18:11:32 GMT
XHTML output format is now available by "XHTML" name by default


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/62f03d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/62f03d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/62f03d80

Branch: refs/heads/2.3
Commit: 62f03d80b800dc8f64ebbd0498c35f03aa3f4f48
Parents: 2944148
Author: ddekany <ddekany@apache.org>
Authored: Mon Dec 21 18:28:42 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Mon Dec 21 18:28:42 2015 +0100

----------------------------------------------------------------------
 src/main/java/freemarker/template/Configuration.java |  2 ++
 src/manual/en_US/book.xml                            | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/62f03d80/src/main/java/freemarker/template/Configuration.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java
index 4199458..0b9d5c3 100644
--- a/src/main/java/freemarker/template/Configuration.java
+++ b/src/main/java/freemarker/template/Configuration.java
@@ -72,6 +72,7 @@ import freemarker.core.TemplateConfiguration;
 import freemarker.core.TemplateMarkupOutputModel;
 import freemarker.core.UndefinedOutputFormat;
 import freemarker.core.UnregisteredOutputFormatException;
+import freemarker.core.XHTMLOutputFormat;
 import freemarker.core.XMLOutputFormat;
 import freemarker.core._CoreAPI;
 import freemarker.core._DelayedJQuote;
@@ -339,6 +340,7 @@ public class Configuration extends Configurable implements Cloneable,
ParserConf
         STANDARD_OUTPUT_FORMATS = new HashMap<String, OutputFormat>();
         STANDARD_OUTPUT_FORMATS.put(UndefinedOutputFormat.INSTANCE.getName(), UndefinedOutputFormat.INSTANCE);
         STANDARD_OUTPUT_FORMATS.put(HTMLOutputFormat.INSTANCE.getName(), HTMLOutputFormat.INSTANCE);
+        STANDARD_OUTPUT_FORMATS.put(XHTMLOutputFormat.INSTANCE.getName(), XHTMLOutputFormat.INSTANCE);
         STANDARD_OUTPUT_FORMATS.put(XMLOutputFormat.INSTANCE.getName(), XMLOutputFormat.INSTANCE);
         STANDARD_OUTPUT_FORMATS.put(RTFOutputFormat.INSTANCE.getName(), RTFOutputFormat.INSTANCE);
         STANDARD_OUTPUT_FORMATS.put(PlainTextOutputFormat.INSTANCE.getName(), PlainTextOutputFormat.INSTANCE);

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/62f03d80/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 295f043..18d3f9e 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -5322,6 +5322,20 @@ jsmith@other.com, jsmith@other.com, jsmith@other.com</programlisting>
 
                 <td><literal>HTMLOutputFormat.INSTANCE</literal></td>
               </tr>
+
+              <tr>
+                <td><literal>XHTML</literal></td>
+
+                <td>Escapes <literal>&lt;</literal>, <literal>&gt;</literal>,
+                <literal>&amp;</literal>, <literal>"</literal>,
+                <literal>'</literal> as <literal>&amp;lt;</literal>,
+                <literal>&amp;gt;</literal>, <literal>&amp;amp;</literal>,
+                <literal>&amp;#39;</literal></td>
+
+                <td><literal>application/xhtml+xml</literal></td>
+
+                <td><literal>XHTMLOutputFormat.INSTANCE</literal></td>
+              </tr>
             </tbody>
 
             <tbody>


Mime
View raw message