From c7a6265869ead9444bf93cfa39440f27db5ab388 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 7 Nov 2013 20:09:22 -0800
Subject: [PATCH] organize text code in subdirectory

---
 bindings/python/mapnik_text_placement.cpp     | 12 ++++----
 include/build.py                              |  2 +-
 include/mapnik/attribute_collector.hpp        |  2 +-
 include/mapnik/font_engine_freetype.hpp       |  2 +-
 include/mapnik/{ => text}/char_info.hpp       |  0
 .../mapnik/{font_util.hpp => text/face.hpp}   |  0
 include/mapnik/{ => text}/formatting/base.hpp |  0
 .../formatting/expression_format.hpp          |  2 +-
 .../mapnik/{ => text}/formatting/format.hpp   |  4 +--
 include/mapnik/{ => text}/formatting/list.hpp |  2 +-
 .../mapnik/{ => text}/formatting/registry.hpp |  2 +-
 include/mapnik/{ => text}/formatting/text.hpp |  2 +-
 .../mapnik/{ => text}/placement_finder.hpp    |  4 +--
 .../placements}/base.hpp                      |  4 +--
 .../placements}/dummy.hpp                     |  2 +-
 .../placements}/list.hpp                      |  2 +-
 .../placements}/registry.hpp                  |  2 +-
 .../placements}/simple.hpp                    |  2 +-
 include/mapnik/{ => text}/processed_text.hpp  |  4 +--
 .../mapnik/{ => text}/symbolizer_helpers.hpp  |  4 +--
 include/mapnik/{ => text}/text_path.hpp       |  2 +-
 include/mapnik/{ => text}/text_properties.hpp |  2 +-
 include/mapnik/text_symbolizer.hpp            |  4 +--
 src/agg/process_shield_symbolizer.cpp         |  4 +--
 src/agg/process_text_symbolizer.cpp           |  4 +--
 src/build.py                                  | 30 +++++++++----------
 src/cairo_context.cpp                         |  6 ++--
 src/cairo_renderer.cpp                        |  4 +--
 src/font_engine_freetype.cpp                  |  6 ++--
 src/grid/process_shield_symbolizer.cpp        |  4 +--
 src/grid/process_text_symbolizer.cpp          |  4 +--
 src/load_map.cpp                              |  4 +--
 src/save_map.cpp                              |  6 ++--
 src/{ => text}/formatting/base.cpp            |  6 ++--
 src/{ => text}/formatting/expression.cpp      |  4 +--
 src/{ => text}/formatting/format.cpp          |  2 +-
 src/{ => text}/formatting/list.cpp            |  2 +-
 src/{ => text}/formatting/registry.cpp        |  8 ++---
 src/{ => text}/formatting/text.cpp            |  6 ++--
 src/{ => text}/placement_finder.cpp           |  6 ++--
 .../placements}/base.cpp                      |  2 +-
 .../placements}/dummy.cpp                     |  2 +-
 .../placements}/list.cpp                      |  2 +-
 .../placements}/registry.cpp                  |  8 ++---
 .../placements}/simple.cpp                    |  2 +-
 src/{ => text}/processed_text.cpp             |  2 +-
 src/{ => text}/symbolizer_helpers.cpp         |  4 +--
 src/{ => text}/text_properties.cpp            |  6 ++--
 src/text_symbolizer.cpp                       |  2 +-
 src/xml_tree.cpp                              |  2 +-
 50 files changed, 100 insertions(+), 100 deletions(-)
 rename include/mapnik/{ => text}/char_info.hpp (100%)
 rename include/mapnik/{font_util.hpp => text/face.hpp} (100%)
 rename include/mapnik/{ => text}/formatting/base.hpp (100%)
 rename include/mapnik/{ => text}/formatting/expression_format.hpp (98%)
 rename include/mapnik/{ => text}/formatting/format.hpp (96%)
 rename include/mapnik/{ => text}/formatting/list.hpp (97%)
 rename include/mapnik/{ => text}/formatting/registry.hpp (97%)
 rename include/mapnik/{ => text}/formatting/text.hpp (97%)
 rename include/mapnik/{ => text}/placement_finder.hpp (98%)
 rename include/mapnik/{text_placements => text/placements}/base.hpp (98%)
 rename include/mapnik/{text_placements => text/placements}/dummy.hpp (97%)
 rename include/mapnik/{text_placements => text/placements}/list.hpp (98%)
 rename include/mapnik/{text_placements => text/placements}/registry.hpp (97%)
 rename include/mapnik/{text_placements => text/placements}/simple.hpp (98%)
 rename include/mapnik/{ => text}/processed_text.hpp (96%)
 rename include/mapnik/{ => text}/symbolizer_helpers.hpp (98%)
 rename include/mapnik/{ => text}/text_path.hpp (99%)
 rename include/mapnik/{ => text}/text_properties.hpp (99%)
 rename src/{ => text}/formatting/base.cpp (94%)
 rename src/{ => text}/formatting/expression.cpp (98%)
 rename src/{ => text}/formatting/format.cpp (99%)
 rename src/{ => text}/formatting/list.cpp (97%)
 rename src/{ => text}/formatting/registry.cpp (90%)
 rename src/{ => text}/formatting/text.cpp (95%)
 rename src/{ => text}/placement_finder.cpp (99%)
 rename src/{text_placements => text/placements}/base.cpp (97%)
 rename src/{text_placements => text/placements}/dummy.cpp (96%)
 rename src/{text_placements => text/placements}/list.cpp (98%)
 rename src/{text_placements => text/placements}/registry.cpp (91%)
 rename src/{text_placements => text/placements}/simple.cpp (99%)
 rename src/{ => text}/processed_text.cpp (98%)
 rename src/{ => text}/symbolizer_helpers.cpp (99%)
 rename src/{ => text}/text_properties.cpp (99%)

diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp
index b30cc9485..11f0a05cc 100644
--- a/bindings/python/mapnik_text_placement.cpp
+++ b/bindings/python/mapnik_text_placement.cpp
@@ -26,12 +26,12 @@
 #include <boost/python/stl_iterator.hpp>
 #include <boost/noncopyable.hpp>
 
-#include <mapnik/text_properties.hpp>
-#include <mapnik/formatting/text.hpp>
-#include <mapnik/formatting/list.hpp>
-#include <mapnik/formatting/format.hpp>
-#include <mapnik/formatting/expression_format.hpp>
-#include <mapnik/processed_text.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/formatting/text.hpp>
+#include <mapnik/text/formatting/list.hpp>
+#include <mapnik/text/formatting/format.hpp>
+#include <mapnik/text/formatting/expression_format.hpp>
+#include <mapnik/text/processed_text.hpp>
 #include <mapnik/text_symbolizer.hpp>
 
 #include "mapnik_enumeration.hpp"
diff --git a/include/build.py b/include/build.py
index 9cf68fa05..2e1954db5 100644
--- a/include/build.py
+++ b/include/build.py
@@ -25,7 +25,7 @@ from glob import glob
 Import('env')
 
 base = './mapnik/'
-subdirs = ['','svg','wkt','grid','json','util','text_placements','formatting']
+subdirs = ['','svg','wkt','grid','json','util','text','text/placements','text/formatting']
 
 if env['SVG_RENDERER']:
     subdirs.append('svg/output')
diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp
index bc70dd459..8a36deae2 100644
--- a/include/mapnik/attribute_collector.hpp
+++ b/include/mapnik/attribute_collector.hpp
@@ -44,7 +44,7 @@
 #include <mapnik/expression_node.hpp>
 #include <mapnik/parse_path.hpp>  // for path_processor_type
 #include <mapnik/path_expression.hpp>  // for path_expression_ptr
-#include <mapnik/text_placements/base.hpp>  // for text_placements
+#include <mapnik/text/placements/base.hpp>  // for text_placements
 
 // boost
 #include <boost/variant/static_visitor.hpp>
diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp
index 748b1de35..e7a8399cd 100644
--- a/include/mapnik/font_engine_freetype.hpp
+++ b/include/mapnik/font_engine_freetype.hpp
@@ -31,7 +31,7 @@
 #include <mapnik/ctrans.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/font_set.hpp>
-#include <mapnik/char_info.hpp>
+#include <mapnik/text/char_info.hpp>
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/noncopyable.hpp>
diff --git a/include/mapnik/char_info.hpp b/include/mapnik/text/char_info.hpp
similarity index 100%
rename from include/mapnik/char_info.hpp
rename to include/mapnik/text/char_info.hpp
diff --git a/include/mapnik/font_util.hpp b/include/mapnik/text/face.hpp
similarity index 100%
rename from include/mapnik/font_util.hpp
rename to include/mapnik/text/face.hpp
diff --git a/include/mapnik/formatting/base.hpp b/include/mapnik/text/formatting/base.hpp
similarity index 100%
rename from include/mapnik/formatting/base.hpp
rename to include/mapnik/text/formatting/base.hpp
diff --git a/include/mapnik/formatting/expression_format.hpp b/include/mapnik/text/formatting/expression_format.hpp
similarity index 98%
rename from include/mapnik/formatting/expression_format.hpp
rename to include/mapnik/text/formatting/expression_format.hpp
index da5f718cf..8e6f15f49 100644
--- a/include/mapnik/formatting/expression_format.hpp
+++ b/include/mapnik/text/formatting/expression_format.hpp
@@ -23,7 +23,7 @@
 #ifndef FORMATTING_EXPRESSION_HPP
 #define FORMATTING_EXPRESSION_HPP
 
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
 #include <mapnik/expression.hpp>
 
 // boost
diff --git a/include/mapnik/formatting/format.hpp b/include/mapnik/text/formatting/format.hpp
similarity index 96%
rename from include/mapnik/formatting/format.hpp
rename to include/mapnik/text/formatting/format.hpp
index b22ea6398..b6a763ef0 100644
--- a/include/mapnik/formatting/format.hpp
+++ b/include/mapnik/text/formatting/format.hpp
@@ -23,8 +23,8 @@
 #ifndef FORMATTING_FORMAT_HPP
 #define FORMATTING_FORMAT_HPP
 
-#include <mapnik/formatting/base.hpp>
-#include <mapnik/text_properties.hpp>
+#include <mapnik/text/formatting/base.hpp>
+#include <mapnik/text/text_properties.hpp>
 #include <mapnik/feature.hpp>
 
 // boost
diff --git a/include/mapnik/formatting/list.hpp b/include/mapnik/text/formatting/list.hpp
similarity index 97%
rename from include/mapnik/formatting/list.hpp
rename to include/mapnik/text/formatting/list.hpp
index 56ab455a1..54be03d33 100644
--- a/include/mapnik/formatting/list.hpp
+++ b/include/mapnik/text/formatting/list.hpp
@@ -23,7 +23,7 @@
 #define FORMATTING_LIST_HPP
 
 // mapnik
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
 #include <mapnik/feature.hpp>
 
 // boost
diff --git a/include/mapnik/formatting/registry.hpp b/include/mapnik/text/formatting/registry.hpp
similarity index 97%
rename from include/mapnik/formatting/registry.hpp
rename to include/mapnik/text/formatting/registry.hpp
index 5e77ca006..7e092f5bb 100644
--- a/include/mapnik/formatting/registry.hpp
+++ b/include/mapnik/text/formatting/registry.hpp
@@ -24,7 +24,7 @@
 
 // mapnik
 #include <mapnik/utils.hpp>
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
 #include <mapnik/noncopyable.hpp>
 
 // stl
diff --git a/include/mapnik/formatting/text.hpp b/include/mapnik/text/formatting/text.hpp
similarity index 97%
rename from include/mapnik/formatting/text.hpp
rename to include/mapnik/text/formatting/text.hpp
index bc63fe102..b15004d6b 100644
--- a/include/mapnik/formatting/text.hpp
+++ b/include/mapnik/text/formatting/text.hpp
@@ -22,7 +22,7 @@
 #ifndef FORMATTING_TEXT_HPP
 #define FORMATTING_TEXT_HPP
 
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
 #include <mapnik/feature.hpp>
 
 // boost
diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/text/placement_finder.hpp
similarity index 98%
rename from include/mapnik/placement_finder.hpp
rename to include/mapnik/text/placement_finder.hpp
index 722aee251..f3ca20364 100644
--- a/include/mapnik/placement_finder.hpp
+++ b/include/mapnik/text/placement_finder.hpp
@@ -26,8 +26,8 @@
 // mapnik
 #include <mapnik/geometry.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/text_properties.hpp>
-#include <mapnik/text_path.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/text_path.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/ctrans.hpp>
 #include <mapnik/noncopyable.hpp>
diff --git a/include/mapnik/text_placements/base.hpp b/include/mapnik/text/placements/base.hpp
similarity index 98%
rename from include/mapnik/text_placements/base.hpp
rename to include/mapnik/text/placements/base.hpp
index df375bc92..d1816093f 100644
--- a/include/mapnik/text_placements/base.hpp
+++ b/include/mapnik/text/placements/base.hpp
@@ -25,8 +25,8 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/text_properties.hpp>
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/formatting/base.hpp>
 
 namespace mapnik
 {
diff --git a/include/mapnik/text_placements/dummy.hpp b/include/mapnik/text/placements/dummy.hpp
similarity index 97%
rename from include/mapnik/text_placements/dummy.hpp
rename to include/mapnik/text/placements/dummy.hpp
index fd58c8b4c..619b93a53 100644
--- a/include/mapnik/text_placements/dummy.hpp
+++ b/include/mapnik/text/placements/dummy.hpp
@@ -24,7 +24,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
 // boost
 #include <boost/concept_check.hpp>
 
diff --git a/include/mapnik/text_placements/list.hpp b/include/mapnik/text/placements/list.hpp
similarity index 98%
rename from include/mapnik/text_placements/list.hpp
rename to include/mapnik/text/placements/list.hpp
index 362800233..c08b62e5b 100644
--- a/include/mapnik/text_placements/list.hpp
+++ b/include/mapnik/text/placements/list.hpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 #ifndef TEXT_PLACEMENTS_LIST_HPP
 #define TEXT_PLACEMENTS_LIST_HPP
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/text_placements/registry.hpp b/include/mapnik/text/placements/registry.hpp
similarity index 97%
rename from include/mapnik/text_placements/registry.hpp
rename to include/mapnik/text/placements/registry.hpp
index 4fc71070e..0b6fc25bd 100644
--- a/include/mapnik/text_placements/registry.hpp
+++ b/include/mapnik/text/placements/registry.hpp
@@ -24,7 +24,7 @@
 
 // mapnik
 #include <mapnik/utils.hpp>
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
 #include <mapnik/noncopyable.hpp>
 
 // stl
diff --git a/include/mapnik/text_placements/simple.hpp b/include/mapnik/text/placements/simple.hpp
similarity index 98%
rename from include/mapnik/text_placements/simple.hpp
rename to include/mapnik/text/placements/simple.hpp
index 59c57d87e..e6fcfbdb3 100644
--- a/include/mapnik/text_placements/simple.hpp
+++ b/include/mapnik/text/placements/simple.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_TEXT_PLACEMENTS_SIMPLE_HPP
 
 // mapnik
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/processed_text.hpp b/include/mapnik/text/processed_text.hpp
similarity index 96%
rename from include/mapnik/processed_text.hpp
rename to include/mapnik/text/processed_text.hpp
index 3bc45aa92..6a43f8e16 100644
--- a/include/mapnik/processed_text.hpp
+++ b/include/mapnik/text/processed_text.hpp
@@ -23,8 +23,8 @@
 #define PROCESSED_TEXT_HPP
 
 // mapnik
-#include <mapnik/text_properties.hpp>
-#include <mapnik/text_path.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/text_path.hpp>
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/value_types.hpp>
 
diff --git a/include/mapnik/symbolizer_helpers.hpp b/include/mapnik/text/symbolizer_helpers.hpp
similarity index 98%
rename from include/mapnik/symbolizer_helpers.hpp
rename to include/mapnik/text/symbolizer_helpers.hpp
index 555871fc7..f83c5c6a8 100644
--- a/include/mapnik/symbolizer_helpers.hpp
+++ b/include/mapnik/text/symbolizer_helpers.hpp
@@ -27,8 +27,8 @@
 #include <mapnik/shield_symbolizer.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/marker_cache.hpp>
-#include <mapnik/processed_text.hpp>
-#include <mapnik/text_path.hpp>
+#include <mapnik/text/processed_text.hpp>
+#include <mapnik/text/text_path.hpp>
 
 //boost
 
diff --git a/include/mapnik/text_path.hpp b/include/mapnik/text/text_path.hpp
similarity index 99%
rename from include/mapnik/text_path.hpp
rename to include/mapnik/text/text_path.hpp
index 654f6aafe..2bfdcfe1f 100644
--- a/include/mapnik/text_path.hpp
+++ b/include/mapnik/text/text_path.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_TEXT_PATH_HPP
 
 // mapnik
-#include <mapnik/char_info.hpp>
+#include <mapnik/text/char_info.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/value_types.hpp>
diff --git a/include/mapnik/text_properties.hpp b/include/mapnik/text/text_properties.hpp
similarity index 99%
rename from include/mapnik/text_properties.hpp
rename to include/mapnik/text/text_properties.hpp
index ec03ba8de..478c9c8bc 100644
--- a/include/mapnik/text_properties.hpp
+++ b/include/mapnik/text/text_properties.hpp
@@ -30,7 +30,7 @@
 #include <mapnik/font_set.hpp>
 #include <mapnik/enumeration.hpp>
 #include <mapnik/expression.hpp>
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
 
 // stl
 #include <map>
diff --git a/include/mapnik/text_symbolizer.hpp b/include/mapnik/text_symbolizer.hpp
index bf2d5d4da..c0ee7640b 100644
--- a/include/mapnik/text_symbolizer.hpp
+++ b/include/mapnik/text_symbolizer.hpp
@@ -27,8 +27,8 @@
 #include <mapnik/color.hpp>
 #include <mapnik/font_set.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/text_placements/base.hpp>
-#include <mapnik/text_placements/dummy.hpp>
+#include <mapnik/text/placements/base.hpp>
+#include <mapnik/text/placements/dummy.hpp>
 
 // boost
 #include <memory>
diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp
index c6c7b66f8..f723918ff 100644
--- a/src/agg/process_shield_symbolizer.cpp
+++ b/src/agg/process_shield_symbolizer.cpp
@@ -25,9 +25,9 @@
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/agg_rasterizer.hpp>
 #include <mapnik/image_util.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/pixel_position.hpp>
-#include <mapnik/font_util.hpp>
+#include <mapnik/text/face.hpp>
 
 // boost
 
diff --git a/src/agg/process_text_symbolizer.cpp b/src/agg/process_text_symbolizer.cpp
index b9e9a53ce..123404522 100644
--- a/src/agg/process_text_symbolizer.cpp
+++ b/src/agg/process_text_symbolizer.cpp
@@ -24,9 +24,9 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/agg_rasterizer.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/graphics.hpp>
-#include <mapnik/font_util.hpp>
+#include <mapnik/text/face.hpp>
 
 namespace mapnik {
 
diff --git a/src/build.py b/src/build.py
index 7d72dd666..a6f49b272 100644
--- a/src/build.py
+++ b/src/build.py
@@ -165,7 +165,7 @@ source = Split(
     parse_transform.cpp
     palette.cpp
     path_expression_grammar.cpp
-    placement_finder.cpp
+    text/placement_finder.cpp
     plugin.cpp
     point_symbolizer.cpp
     polygon_pattern_symbolizer.cpp
@@ -183,7 +183,7 @@ source = Split(
     memory_datasource.cpp
     stroke.cpp
     symbolizer.cpp
-    symbolizer_helpers.cpp
+    text/symbolizer_helpers.cpp
     unicode.cpp
     markers_symbolizer.cpp
     raster_colorizer.cpp
@@ -203,19 +203,19 @@ source = Split(
     json/feature_parser.cpp
     json/feature_collection_parser.cpp
     json/geojson_generator.cpp
-    processed_text.cpp
-    formatting/base.cpp
-    formatting/expression.cpp
-    formatting/list.cpp
-    formatting/text.cpp
-    formatting/format.cpp
-    formatting/registry.cpp
-    text_placements/registry.cpp
-    text_placements/base.cpp
-    text_placements/dummy.cpp
-    text_placements/list.cpp
-    text_placements/simple.cpp
-    text_properties.cpp
+    text/processed_text.cpp
+    text/formatting/base.cpp
+    text/formatting/expression.cpp
+    text/formatting/list.cpp
+    text/formatting/text.cpp
+    text/formatting/format.cpp
+    text/formatting/registry.cpp
+    text/placements/registry.cpp
+    text/placements/base.cpp
+    text/placements/dummy.cpp
+    text/placements/list.cpp
+    text/placements/simple.cpp
+    text/text_properties.cpp
     xml_tree.cpp
     config_error.cpp
     color_factory.cpp
diff --git a/src/cairo_context.cpp b/src/cairo_context.cpp
index 227d6dd8c..de6b8ff38 100644
--- a/src/cairo_context.cpp
+++ b/src/cairo_context.cpp
@@ -21,9 +21,9 @@
  *****************************************************************************/
 
 #include <mapnik/cairo_context.hpp>
-#include <mapnik/font_util.hpp>
-#include <mapnik/text_properties.hpp>
-#include <mapnik/text_path.hpp>
+#include <mapnik/text/face.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/text_path.hpp>
 #include <mapnik/font_set.hpp>
 
 #include <cairo-ft.h>
diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index e3b47105b..8e5f87ba9 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -44,12 +44,12 @@
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/segment.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/raster_colorizer.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/warp.hpp>
 #include <mapnik/config.hpp>
-#include <mapnik/text_path.hpp>
+#include <mapnik/text/text_path.hpp>
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/marker_helpers.hpp>
 #include <mapnik/noncopyable.hpp>
diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp
index 8dc78caa2..fd7994a04 100644
--- a/src/font_engine_freetype.cpp
+++ b/src/font_engine_freetype.cpp
@@ -23,7 +23,6 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/font_engine_freetype.hpp>
-#include <mapnik/text_properties.hpp>
 #include <mapnik/graphics.hpp>
 #include <mapnik/value_types.hpp>
 
@@ -31,9 +30,10 @@
 #include <mapnik/grid/grid.hpp>
 #endif
 
-#include <mapnik/text_path.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/text_path.hpp>
 #include <mapnik/pixel_position.hpp>
-#include <mapnik/font_util.hpp>
+#include <mapnik/text/face.hpp>
 #include <mapnik/util/fs.hpp>
 
 // boost
diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp
index 0fab6d5e1..7f4385a53 100644
--- a/src/grid/process_shield_symbolizer.cpp
+++ b/src/grid/process_shield_symbolizer.cpp
@@ -27,9 +27,9 @@
 #include <mapnik/grid/grid_renderer.hpp>
 #include <mapnik/grid/grid_renderer_base.hpp>
 #include <mapnik/grid/grid.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/pixel_position.hpp>
-#include <mapnik/font_util.hpp>
+#include <mapnik/text/face.hpp>
 
 // agg
 #include "agg_trans_affine.h"
diff --git a/src/grid/process_text_symbolizer.cpp b/src/grid/process_text_symbolizer.cpp
index 40e6ed5a3..39a682692 100644
--- a/src/grid/process_text_symbolizer.cpp
+++ b/src/grid/process_text_symbolizer.cpp
@@ -23,8 +23,8 @@
 // mapnik
 #include <mapnik/feature.hpp>
 #include <mapnik/grid/grid_renderer.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
-#include <mapnik/font_util.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
+#include <mapnik/text/face.hpp>
 
 namespace mapnik {
 
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 1925aa030..295335daf 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -41,8 +41,8 @@
 #include <mapnik/parse_transform.hpp>
 #include <mapnik/raster_colorizer.hpp>
 #include <mapnik/svg/svg_path_parser.hpp>
-#include <mapnik/text_placements/registry.hpp>
-#include <mapnik/text_placements/dummy.hpp>
+#include <mapnik/text/placements/registry.hpp>
+#include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/rule.hpp>
 #include <mapnik/config_error.hpp>
diff --git a/src/save_map.cpp b/src/save_map.cpp
index 1c0c2af64..1f8bb857d 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -30,9 +30,9 @@
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/raster_colorizer.hpp>
-#include <mapnik/text_placements/simple.hpp>
-#include <mapnik/text_placements/list.hpp>
-#include <mapnik/text_placements/dummy.hpp>
+#include <mapnik/text/placements/simple.hpp>
+#include <mapnik/text/placements/list.hpp>
+#include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/image_scaling.hpp>
 #include <mapnik/image_filter.hpp>
diff --git a/src/formatting/base.cpp b/src/text/formatting/base.cpp
similarity index 94%
rename from src/formatting/base.cpp
rename to src/text/formatting/base.cpp
index 849c8f13e..3af84c948 100644
--- a/src/formatting/base.cpp
+++ b/src/text/formatting/base.cpp
@@ -22,9 +22,9 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/formatting/base.hpp>
-#include <mapnik/formatting/list.hpp>
-#include <mapnik/formatting/registry.hpp>
+#include <mapnik/text/formatting/base.hpp>
+#include <mapnik/text/formatting/list.hpp>
+#include <mapnik/text/formatting/registry.hpp>
 #include <mapnik/xml_node.hpp>
 
 // boost
diff --git a/src/formatting/expression.cpp b/src/text/formatting/expression.cpp
similarity index 98%
rename from src/formatting/expression.cpp
rename to src/text/formatting/expression.cpp
index eff17daf3..f8a885640 100644
--- a/src/formatting/expression.cpp
+++ b/src/text/formatting/expression.cpp
@@ -22,11 +22,11 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/formatting/expression_format.hpp>
+#include <mapnik/text/formatting/expression_format.hpp>
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/expression_evaluator.hpp>
-#include <mapnik/text_properties.hpp>
+#include <mapnik/text/text_properties.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/xml_node.hpp>
 
diff --git a/src/formatting/format.cpp b/src/text/formatting/format.cpp
similarity index 99%
rename from src/formatting/format.cpp
rename to src/text/formatting/format.cpp
index affea73d8..812614edf 100644
--- a/src/formatting/format.cpp
+++ b/src/text/formatting/format.cpp
@@ -23,7 +23,7 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/formatting/format.hpp>
+#include <mapnik/text/formatting/format.hpp>
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/xml_node.hpp>
 
diff --git a/src/formatting/list.cpp b/src/text/formatting/list.cpp
similarity index 97%
rename from src/formatting/list.cpp
rename to src/text/formatting/list.cpp
index 777e78b85..77d3a57e1 100644
--- a/src/formatting/list.cpp
+++ b/src/text/formatting/list.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/formatting/list.hpp>
+#include <mapnik/text/formatting/list.hpp>
 #include <mapnik/feature.hpp>
 
 // boost
diff --git a/src/formatting/registry.cpp b/src/text/formatting/registry.cpp
similarity index 90%
rename from src/formatting/registry.cpp
rename to src/text/formatting/registry.cpp
index b9a9d0bf7..442743fe0 100644
--- a/src/formatting/registry.cpp
+++ b/src/text/formatting/registry.cpp
@@ -20,10 +20,10 @@
  *
  *****************************************************************************/
 // mapnik
-#include <mapnik/formatting/registry.hpp>
-#include <mapnik/formatting/text.hpp>
-#include <mapnik/formatting/format.hpp>
-#include <mapnik/formatting/expression_format.hpp>
+#include <mapnik/text/formatting/registry.hpp>
+#include <mapnik/text/formatting/text.hpp>
+#include <mapnik/text/formatting/format.hpp>
+#include <mapnik/text/formatting/expression_format.hpp>
 #include <mapnik/xml_node.hpp>
 #include <mapnik/config_error.hpp>
 
diff --git a/src/formatting/text.cpp b/src/text/formatting/text.cpp
similarity index 95%
rename from src/formatting/text.cpp
rename to src/text/formatting/text.cpp
index 94f0cc819..0188622cd 100644
--- a/src/formatting/text.cpp
+++ b/src/text/formatting/text.cpp
@@ -20,12 +20,12 @@
  *
  *****************************************************************************/
 // mapnik
-#include <mapnik/formatting/text.hpp>
+#include <mapnik/text/formatting/text.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/text_properties.hpp>
-#include <mapnik/processed_text.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/processed_text.hpp>
 #include <mapnik/xml_node.hpp>
 #include <mapnik/value_types.hpp>
 
diff --git a/src/placement_finder.cpp b/src/text/placement_finder.cpp
similarity index 99%
rename from src/placement_finder.cpp
rename to src/text/placement_finder.cpp
index 3a304e716..404c94b7f 100644
--- a/src/placement_finder.cpp
+++ b/src/text/placement_finder.cpp
@@ -23,11 +23,11 @@
 //mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/placement_finder.hpp>
+#include <mapnik/text/placement_finder.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/text_path.hpp>
+#include <mapnik/text/text_path.hpp>
 #include <mapnik/fastmath.hpp>
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
 
 // agg
 #include "agg_path_length.h"
diff --git a/src/text_placements/base.cpp b/src/text/placements/base.cpp
similarity index 97%
rename from src/text_placements/base.cpp
rename to src/text/placements/base.cpp
index c753d34da..02f1c1283 100644
--- a/src/text_placements/base.cpp
+++ b/src/text/placements/base.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
 
 namespace mapnik {
 text_placements::text_placements() : defaults()
diff --git a/src/text_placements/dummy.cpp b/src/text/placements/dummy.cpp
similarity index 96%
rename from src/text_placements/dummy.cpp
rename to src/text/placements/dummy.cpp
index d13a0f9db..81acb4523 100644
--- a/src/text_placements/dummy.cpp
+++ b/src/text/placements/dummy.cpp
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/text_placements/dummy.hpp>
+#include <mapnik/text/placements/dummy.hpp>
 
 namespace mapnik
 {
diff --git a/src/text_placements/list.cpp b/src/text/placements/list.cpp
similarity index 98%
rename from src/text_placements/list.cpp
rename to src/text/placements/list.cpp
index 53cbab17c..39e3682e2 100644
--- a/src/text_placements/list.cpp
+++ b/src/text/placements/list.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 //mapnik
-#include <mapnik/text_placements/list.hpp>
+#include <mapnik/text/placements/list.hpp>
 #include <mapnik/xml_node.hpp>
 
 //boost
diff --git a/src/text_placements/registry.cpp b/src/text/placements/registry.cpp
similarity index 91%
rename from src/text_placements/registry.cpp
rename to src/text/placements/registry.cpp
index cf12b6213..96dcb84a8 100644
--- a/src/text_placements/registry.cpp
+++ b/src/text/placements/registry.cpp
@@ -20,10 +20,10 @@
  *
  *****************************************************************************/
 // mapnik
-#include <mapnik/text_placements/registry.hpp>
-#include <mapnik/text_placements/simple.hpp>
-#include <mapnik/text_placements/list.hpp>
-#include <mapnik/text_placements/dummy.hpp>
+#include <mapnik/text/placements/registry.hpp>
+#include <mapnik/text/placements/simple.hpp>
+#include <mapnik/text/placements/list.hpp>
+#include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/config_error.hpp>
 
 namespace mapnik
diff --git a/src/text_placements/simple.cpp b/src/text/placements/simple.cpp
similarity index 99%
rename from src/text_placements/simple.cpp
rename to src/text/placements/simple.cpp
index 9eb13697a..ee08527a7 100644
--- a/src/text_placements/simple.cpp
+++ b/src/text/placements/simple.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/text_placements/simple.hpp>
+#include <mapnik/text/placements/simple.hpp>
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/xml_node.hpp>
 
diff --git a/src/processed_text.cpp b/src/text/processed_text.cpp
similarity index 98%
rename from src/processed_text.cpp
rename to src/text/processed_text.cpp
index 52be27c9a..69c3a0493 100644
--- a/src/processed_text.cpp
+++ b/src/text/processed_text.cpp
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/processed_text.hpp>
+#include <mapnik/text/processed_text.hpp>
 #include <mapnik/config_error.hpp>
 #include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/value_types.hpp>
diff --git a/src/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
similarity index 99%
rename from src/symbolizer_helpers.cpp
rename to src/text/symbolizer_helpers.cpp
index ddb6548bb..392bc0f50 100644
--- a/src/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -26,9 +26,9 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/parse_path.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/label_collision_detector.hpp>
-#include <mapnik/placement_finder.hpp>
+#include <mapnik/text/placement_finder.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/expression_evaluator.hpp>
diff --git a/src/text_properties.cpp b/src/text/text_properties.cpp
similarity index 99%
rename from src/text_properties.cpp
rename to src/text/text_properties.cpp
index 2b4e53b44..7279f0256 100644
--- a/src/text_properties.cpp
+++ b/src/text/text_properties.cpp
@@ -22,11 +22,11 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/text_properties.hpp>
-#include <mapnik/processed_text.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/processed_text.hpp>
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/expression_string.hpp>
-#include <mapnik/formatting/text.hpp>
+#include <mapnik/text/formatting/text.hpp>
 #include <mapnik/xml_node.hpp>
 #include <mapnik/config_error.hpp>
 
diff --git a/src/text_symbolizer.cpp b/src/text_symbolizer.cpp
index e4a355db6..20eef1120 100644
--- a/src/text_symbolizer.cpp
+++ b/src/text_symbolizer.cpp
@@ -24,7 +24,7 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/enumeration.hpp>
-#include <mapnik/formatting/text.hpp>
+#include <mapnik/text/formatting/text.hpp>
 
 namespace mapnik
 {
diff --git a/src/xml_tree.cpp b/src/xml_tree.cpp
index 53cea607e..98ccc4b9e 100644
--- a/src/xml_tree.cpp
+++ b/src/xml_tree.cpp
@@ -34,7 +34,7 @@
 #include <mapnik/point_symbolizer.hpp>
 #include <mapnik/markers_symbolizer.hpp>
 #include <mapnik/feature_type_style.hpp>
-#include <mapnik/text_properties.hpp>
+#include <mapnik/text/text_properties.hpp>
 #include <mapnik/config_error.hpp>
 #include <mapnik/raster_colorizer.hpp>