From 508ce0b65def5ef8cc9d627bbd27b9e6e075e419 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Sun, 12 Feb 2012 02:10:08 +0100
Subject: [PATCH] Move formating::format_node.

---
 include/mapnik/formating/format.hpp | 58 +++++++++++++++++++++++++++++
 include/mapnik/text_processing.hpp  | 32 ----------------
 2 files changed, 58 insertions(+), 32 deletions(-)
 create mode 100644 include/mapnik/formating/format.hpp

diff --git a/include/mapnik/formating/format.hpp b/include/mapnik/formating/format.hpp
new file mode 100644
index 000000000..644acc53b
--- /dev/null
+++ b/include/mapnik/formating/format.hpp
@@ -0,0 +1,58 @@
+/*****************************************************************************
+ *
+ * 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 FORMAT_HPP
+#define FORMAT_HPP
+
+#include <mapnik/formating/base.hpp>
+
+namespace mapnik {
+namespace formating {
+class format_node: public node {
+public:
+    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_child(node_ptr child);
+    node_ptr get_child() const;
+
+    boost::optional<std::string> face_name;
+    boost::optional<unsigned> text_size;
+    boost::optional<unsigned> character_spacing;
+    boost::optional<unsigned> line_spacing;
+    boost::optional<double> text_opacity;
+    boost::optional<bool> wrap_before;
+    boost::optional<unsigned> wrap_char;
+    boost::optional<text_transform_e> text_transform;
+    boost::optional<color> fill;
+    boost::optional<color> halo_fill;
+    boost::optional<double> halo_radius;
+
+private:
+    node_ptr child_;
+};
+} //ns formating
+} //ns mapnik
+
+#endif // FORMAT_HPP
diff --git a/include/mapnik/text_processing.hpp b/include/mapnik/text_processing.hpp
index 048a5ac00..9135309e8 100644
--- a/include/mapnik/text_processing.hpp
+++ b/include/mapnik/text_processing.hpp
@@ -95,38 +95,6 @@ enum text_transform
     text_transform_MAX
 };
 DEFINE_ENUM( text_transform_e, text_transform );
-
-namespace formating {
-
-
-class format_node: public node {
-public:
-    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_child(node_ptr child);
-    node_ptr get_child() const;
-
-    boost::optional<std::string> face_name;
-    boost::optional<unsigned> text_size;
-    boost::optional<unsigned> character_spacing;
-    boost::optional<unsigned> line_spacing;
-    boost::optional<double> text_opacity;
-    boost::optional<bool> wrap_before;
-    boost::optional<unsigned> wrap_char;
-    boost::optional<text_transform_e> text_transform;
-    boost::optional<color> fill;
-    boost::optional<color> halo_fill;
-    boost::optional<double> halo_radius;
-
-private:
-    node_ptr child_;
-};
-
-} //namespace formating
-
 } /* namespace mapnik*/
 
 #endif