Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3E8DC181E0 for ; Wed, 30 Dec 2015 18:12:01 +0000 (UTC) Received: (qmail 31554 invoked by uid 500); 30 Dec 2015 18:12:01 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 31498 invoked by uid 500); 30 Dec 2015 18:12:01 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 31410 invoked by uid 99); 30 Dec 2015 18:12:00 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Dec 2015 18:12:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4F3BB1A02DA for ; Wed, 30 Dec 2015 18:12:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id oz4JodHfHdka for ; Wed, 30 Dec 2015 18:11:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 62DB72304C for ; Wed, 30 Dec 2015 18:11:57 +0000 (UTC) Received: (qmail 30967 invoked by uid 99); 30 Dec 2015 18:11:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Dec 2015 18:11:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2ADDEE0451; Wed, 30 Dec 2015 18:11:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Wed, 30 Dec 2015 18:12:08 -0000 Message-Id: In-Reply-To: <339cef967c1c4632a2fb638d2118b400@git.apache.org> References: <339cef967c1c4632a2fb638d2118b400@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/35] incubator-freemarker git commit: RTFOutputFormat uses application/rtf instead of text/rtf RTFOutputFormat uses application/rtf instead of text/rtf Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d9f6b444 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d9f6b444 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d9f6b444 Branch: refs/heads/master Commit: d9f6b4444c1bf8d910b5ff54f7b8b5cb07606abf Parents: 62f03d8 Author: ddekany Authored: Tue Dec 22 11:32:16 2015 +0100 Committer: ddekany Committed: Tue Dec 22 11:32:16 2015 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/RTFOutputFormat.java | 2 +- src/manual/en_US/book.xml | 7 ++++++- src/test/java/freemarker/core/RTFOutputFormatTest.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d9f6b444/src/main/java/freemarker/core/RTFOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/RTFOutputFormat.java b/src/main/java/freemarker/core/RTFOutputFormat.java index 2d613e0..86eb103 100644 --- a/src/main/java/freemarker/core/RTFOutputFormat.java +++ b/src/main/java/freemarker/core/RTFOutputFormat.java @@ -47,7 +47,7 @@ public final class RTFOutputFormat extends CommonMarkupOutputFormat \ as \{, \}, \\ - text/rtf + application/rtf RTFOutputFormat.INSTANCE @@ -26477,6 +26477,11 @@ TemplateModel x = env.getVariable("x"); // get variable x + RTFOutputFormat now uses + application/rtf MIME type instead of text/rtf + + + Added new built-in: is_markup_output, returns true if the value is of type markup output. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d9f6b444/src/test/java/freemarker/core/RTFOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/core/RTFOutputFormatTest.java b/src/test/java/freemarker/core/RTFOutputFormatTest.java index 21e1be5..96d01d0 100644 --- a/src/test/java/freemarker/core/RTFOutputFormatTest.java +++ b/src/test/java/freemarker/core/RTFOutputFormatTest.java @@ -123,7 +123,7 @@ public class RTFOutputFormatTest { @Test public void testGetMimeType() { - assertEquals("text/rtf", INSTANCE.getMimeType()); + assertEquals("application/rtf", INSTANCE.getMimeType()); } }