From e37070f1779ee7a4c375eb488518047666b52919 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Sun, 12 Feb 2012 02:05:27 +0100
Subject: [PATCH] Move formating::text_node.

---
 include/mapnik/formating/text.hpp  | 46 ++++++++++++++++++++++++++++++
 include/mapnik/text_processing.hpp | 14 ---------
 2 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 include/mapnik/formating/text.hpp

diff --git a/include/mapnik/formating/text.hpp b/include/mapnik/formating/text.hpp
new file mode 100644
index 000000000..d07980148
--- /dev/null
+++ b/include/mapnik/formating/text.hpp
@@ -0,0 +1,46 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2012 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+#ifndef TEXT_HPP
+#define TEXT_HPP
+
+#include <mapnik/formating/base.hpp>
+
+namespace mapnik {
+namespace formating {
+class text_node: public node {
+public:
+    text_node(expression_ptr text): node(), text_(text) {}
+    text_node(std::string text): node(), text_(parse_expression(text)) {}
+    void to_xml(boost::property_tree::ptree &xml) const;
+    static node_ptr from_xml(boost::property_tree::ptree const& xml);
+    virtual void apply(char_properties const& p, Feature const& feature, processed_text &output) const;
+    virtual void add_expressions(expression_set &output) const;
+
+    void set_text(expression_ptr text);
+    expression_ptr get_text() const;
+private:
+    expression_ptr text_;
+};
+} //ns formating
+} //ns mapnik
+
+#endif // TEXT_HPP
diff --git a/include/mapnik/text_processing.hpp b/include/mapnik/text_processing.hpp
index 75b4511fb..090ee97d4 100644
--- a/include/mapnik/text_processing.hpp
+++ b/include/mapnik/text_processing.hpp
@@ -113,20 +113,6 @@ private:
     std::vector<node_ptr> children_;
 };
 
-class text_node: public node {
-public:
-    text_node(expression_ptr text): node(), text_(text) {}
-    text_node(std::string text): node(), text_(parse_expression(text)) {}
-    void to_xml(boost::property_tree::ptree &xml) const;
-    static node_ptr from_xml(boost::property_tree::ptree const& xml);
-    virtual void apply(char_properties const& p, Feature const& feature, processed_text &output) const;
-    virtual void add_expressions(expression_set &output) const;
-
-    void set_text(expression_ptr text);
-    expression_ptr get_text() const;
-private:
-    expression_ptr text_;
-};
 
 class format_node: public node {
 public: