Merge pull request #2074 from mapnik/text-refactor

Organize text code in subdirectory

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"

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')

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>

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>

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

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

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

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

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

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>

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
 {

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>
 

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 {
 

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

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 {
 

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>
 

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
 

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>

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>

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>

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
 

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 {
 

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

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>

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>

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

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"

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 {
 

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>

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>

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

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>
 

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>
 

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

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>
 

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>
 

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"

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()

src/text/placements/dummy.cpp

@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/text_placements/dummy.hpp>
+#include <mapnik/text/placements/dummy.hpp>
 
 namespace mapnik
 {

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

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

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>
 

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>

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>

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>
 

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
 {

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>