Clean up directory structure.

mapnik · Sep 23, 2012 · bbedec3 · bbedec3
1 parent fa62234
commit bbedec3
Show file tree

Hide file tree

Showing 49 changed files with 90 additions and 1,320 deletions.
diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp
@@ -22,13 +22,13 @@
 #include <boost/python.hpp>
 #include <boost/python/stl_iterator.hpp>
 
-#include <mapnik/text_properties.hpp>
-#include <mapnik/text_placements/simple.hpp>
-#include <mapnik/text_placements/list.hpp>
-#include <mapnik/formatting/text.hpp>
-#include <mapnik/formatting/list.hpp>
-#include <mapnik/formatting/format.hpp>
-#include <mapnik/formatting/expression_format.hpp>
+#include <mapnik/text/text_properties.hpp>
+#include <mapnik/text/placements/simple.hpp>
+#include <mapnik/text/placements/list.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/layout.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/text_symbolizer.hpp>

diff --git a/include/build.py b/include/build.py
@@ -4,7 +4,7 @@
 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/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp
@@ -37,9 +37,10 @@ extern "C"
 #include FT_STROKER_H
 }
 
-//// boost
+// boost
 #include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
+#include <boost/optional.hpp>
 #ifdef MAPNIK_THREADSAFE
 #include <boost/thread/mutex.hpp>
 #endif
@@ -111,7 +112,7 @@ class MAPNIK_DECL face_manager : private boost::noncopyable
     face_ptr get_face(std::string const& name);
     face_set_ptr get_face_set(std::string const& name);
     face_set_ptr get_face_set(font_set const& fset);
-    face_set_ptr get_face_set(std::string const& name, font_set const& fset);
+    face_set_ptr get_face_set(std::string const& name, boost::optional<font_set> fset);
 
 
     stroker_ptr get_stroker() { return stroker_; }

diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/placement_finder.hpp
diff --git a/include/mapnik/formatting/base.hpp → include/mapnik/text/formatting/base.hpp b/include/mapnik/formatting/base.hpp → include/mapnik/text/formatting/base.hpp
diff --git a/...e/mapnik/formatting/expression_format.hpp → ...nik/text/formatting/expression_format.hpp b/...e/mapnik/formatting/expression_format.hpp → ...nik/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>
 
 namespace mapnik {

diff --git a/include/mapnik/formatting/format.hpp → include/mapnik/text/formatting/format.hpp b/include/mapnik/formatting/format.hpp → 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>
 
 namespace mapnik {
 namespace formatting {

diff --git a/include/mapnik/formatting/list.hpp → include/mapnik/text/formatting/list.hpp b/include/mapnik/formatting/list.hpp → include/mapnik/text/formatting/list.hpp
@@ -22,7 +22,7 @@
 #ifndef FORMATTING_LIST_HPP
 #define FORMATTING_LIST_HPP
 
-#include <mapnik/formatting/base.hpp>
+#include <mapnik/text/formatting/base.hpp>
 
 namespace mapnik {
 namespace formatting {

diff --git a/include/mapnik/formatting/registry.hpp → include/mapnik/text/formatting/registry.hpp b/include/mapnik/formatting/registry.hpp → 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>
 
 // boost
 #include <boost/utility.hpp>

diff --git a/include/mapnik/formatting/text.hpp → include/mapnik/text/formatting/text.hpp b/include/mapnik/formatting/text.hpp → 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>
 
 namespace mapnik {
 namespace formatting {

diff --git a/include/mapnik/text/placement_finder.hpp b/include/mapnik/text/placement_finder.hpp
@@ -26,7 +26,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/text/layout.hpp>
-#include <mapnik/text_placements/base.hpp>
+#include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements_list.hpp>
 #include <mapnik/text/rotation.hpp>
 

diff --git a/include/mapnik/text_placements/base.hpp → include/mapnik/text/placements/base.hpp b/include/mapnik/text_placements/base.hpp → 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 → include/mapnik/text/placements/dummy.hpp b/include/mapnik/text_placements/dummy.hpp → 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 → include/mapnik/text/placements/list.hpp b/include/mapnik/text_placements/list.hpp → 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 → include/mapnik/text/placements/registry.hpp b/include/mapnik/text_placements/registry.hpp → 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>
 
 // boost
 #include <boost/utility.hpp>

diff --git a/include/mapnik/text_placements/simple.hpp → include/mapnik/text/placements/simple.hpp b/include/mapnik/text_placements/simple.hpp → 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/symbolizer_helpers.hpp → include/mapnik/text/symbolizer_helpers.hpp b/include/mapnik/symbolizer_helpers.hpp → include/mapnik/text/symbolizer_helpers.hpp
diff --git a/include/mapnik/text_properties.hpp → include/mapnik/text/text_properties.hpp b/include/mapnik/text_properties.hpp → include/mapnik/text/text_properties.hpp
@@ -28,7 +28,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>
 #include <mapnik/pixel_position.hpp>
 
 // stl

diff --git 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 <boost/shared_ptr.hpp>

diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/agg_renderer.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/text/renderer.hpp>
 
 namespace mapnik {

diff --git a/src/agg/process_text_symbolizer.cpp b/src/agg/process_text_symbolizer.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/agg_renderer.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/text/renderer.hpp>
 #include <boost/foreach.hpp>