move font_options, text.?pp to font folder

also fix indentation in previous commit

src/CMakeLists.txt

@@ -985,10 +985,11 @@ set(libwesnoth-game_STAT_SRC
 	display_context.cpp
 	events.cpp
 	floating_label.cpp
-    font/font_config.cpp
-    font/sdl_ttf.cpp
-    font/text_cache.cpp
-    font/text_surface.cpp
+	font/font_config.cpp
+	font/sdl_ttf.cpp
+	font/text.cpp
+	font/text_cache.cpp
+	font/text_surface.cpp
 	format_time_summary.cpp
   	generators/cave_map_generator.cpp
 	generators/map_create.cpp
@@ -1024,7 +1025,6 @@ set(libwesnoth-game_STAT_SRC
 	terrain/terrain.cpp
 	terrain/builder.cpp
 	terrain/translation.cpp
-	text.cpp
 	time_of_day.cpp
 	tracer.cpp
 	video.cpp

src/SConscript

@@ -92,6 +92,7 @@ libwesnoth_sources = Split("""
     floating_label.cpp
     font/font_config.cpp
     font/sdl_ttf.cpp
+    font/text.cpp
     font/text_cache.cpp
     font/text_surface.cpp
     format_time_summary.cpp
@@ -127,7 +128,6 @@ libwesnoth_sources = Split("""
     terrain/builder.cpp
     terrain/terrain.cpp
     terrain/translation.cpp
-    text.cpp
     theme.cpp
     time_of_day.cpp
     tooltips.cpp

src/display.cpp

@@ -21,6 +21,7 @@
 #include "cursor.hpp"
 #include "display.hpp"
 #include "fake_unit_manager.hpp"
+#include "font/text.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
 #include "halo.hpp"
@@ -38,7 +39,6 @@
 #include "synced_context.hpp"
 #include "team.hpp"
 #include "terrain/builder.hpp"
-#include "text.hpp"
 #include "time_of_day.hpp"
 #include "tooltips.hpp"
 #include "tod_manager.hpp"

src/floating_label.cpp

@@ -16,8 +16,9 @@
 
 #include "display.hpp"
 #include "font/sdl_ttf.hpp"
+#include "font/text.hpp"
 #include "log.hpp"
-#include "text.hpp"
+
 
 #include <map>
 #include <set>

src/font/font_config.cpp

@@ -181,11 +181,11 @@ const t_string& get_font_families(family_class fclass)
  */
 
 manager::manager() {
-  this->init();
+	this->init();
 }
 
 manager::~manager() {
-  this->deinit();
+	this->deinit();
 }
 
 void manager::update_font_path() const

src/font/font_id.hpp

@@ -56,9 +56,9 @@ struct font_id
  */
 struct text_chunk
 {
-	text_chunk(subset_id subset) :
-		subset(subset),
-		text()
+	text_chunk(subset_id subset)
+		: subset(subset)
+		, text()
 	{
 	}
 

src/font/text.hpp

@@ -15,7 +15,7 @@
 #ifndef TEXT_HPP_INCLUDED
 #define TEXT_HPP_INCLUDED
 
-#include "font_options.hpp"
+#include "font/font_options.hpp"
 #include "sdl/utils.hpp"
 #include "serialization/unicode_types.hpp"
 
@@ -26,6 +26,9 @@
 
 #include "sdl/image.hpp"
 
+/***
+ * Note: This is the cairo-pango code path, not the SDL_TTF code path.
+ */
 
 struct language_def;
 

src/font/text_cache.cpp

@@ -1,3 +1,16 @@
+/*
+   Copyright (C) 2016 by Chris Beck<render787@gmail.com>
+   Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY.
+
+   See the COPYING file for more details.
+*/
 
 #include "text_cache.hpp"
 

src/gui/core/canvas.cpp

@@ -22,14 +22,15 @@
 #include "gui/core/canvas.hpp"
 
 #include "config.hpp"
-#include "image.hpp"
+#include "font/text.hpp"
 #include "formatter.hpp"
 #include "gettext.hpp"
+#include "image.hpp"
+
 #include "gui/auxiliary/formula.hpp"
 #include "gui/core/log.hpp"
 #include "gui/widgets/helper.hpp"
 #include "sdl/rect.hpp"
-#include "text.hpp"
 #include "video.hpp"
 #include "wml_exception.hpp"
 

src/gui/core/widget_definition.hpp

@@ -16,7 +16,7 @@
 #define GUI_AUXILIARY_WIDGET_DEFINITION_HPP_INCLUDED
 
 #include "config.hpp"
-#include "font_options.hpp"
+#include "font/font_options.hpp"
 #include "gui/core/canvas.hpp"
 
 namespace gui2

src/gui/dialogs/lua_interpreter.cpp

@@ -28,6 +28,7 @@
 #include "gui/widgets/window.hpp"
 
 #include "desktop/clipboard.hpp"
+#include "font/text.hpp"
 #include "game_config.hpp"
 #include "game_errors.hpp"
 #include "gettext.hpp"
@@ -38,7 +39,6 @@
 #include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
 #include "log.hpp"
-#include "text.hpp"
 
 #include <sstream>
 #include <string>

src/gui/widgets/control.hpp

@@ -18,7 +18,7 @@
 #include "gui/core/widget_definition.hpp"
 #include "gui/core/window_builder.hpp"
 #include "gui/widgets/widget.hpp"
-#include "../../text.hpp" // We want the file in src/
+#include "font/text.hpp" // We want the file in src/
 
 namespace gui2
 {

src/gui/widgets/text.hpp

@@ -17,7 +17,7 @@
 
 //#include "gui/core/event/dispatcher.hpp"
 #include "gui/widgets/control.hpp"
-#include "../../text.hpp" // We want the file in src/
+#include "font/text.hpp" // We want the file in src/
 
 #include <string>
 

src/help/help_browser.cpp

@@ -16,7 +16,7 @@
 #include <iostream>                     // for operator<<, basic_ostream, etc
 #include <SDL_mouse.h>                  // for SDL_GetMouseState, etc
 #include "cursor.hpp"                   // for set, CURSOR_TYPE::HYPERLINK, etc
-#include "font/sdl_ttf.hpp"
+#include "font/sdl_ttf.hpp"             // for relative_size
 #include "gettext.hpp"                  // for _
 #include "gui/dialogs/transient_message.hpp"
 #include "help/help_text_area.hpp"      // for help_text_area

src/help/help_impl.hpp

@@ -33,7 +33,7 @@
 #define HELP_IMPL_INCLUDED
 
 #include "exceptions.hpp"               // for error
-#include "font/sdl_ttf.hpp"                     // for line_width, relative_size
+#include "font/sdl_ttf.hpp"             // for line_width, relative_size
 #include "gettext.hpp"
 #include <cstring>
 #include <list>                         // for list

src/reports.cpp

@@ -19,6 +19,7 @@
 //#include "editor/editor_controller.hpp"
 //#include "editor/palette/terrain_palettes.hpp"
 #include "font/sdl_ttf.hpp"
+#include "font/text.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"
 #include "language.hpp"
@@ -28,7 +29,6 @@
 #include "reports.hpp"
 #include "strftime.hpp"
 #include "team.hpp"
-#include "text.hpp"
 #include "tod_manager.hpp"
 #include "units/unit.hpp"
 #include "units/helper.hpp"

src/storyscreen/interface.cpp

@@ -23,12 +23,12 @@
 #include "storyscreen/interface.hpp"
 #include "storyscreen/controller.hpp"
 
+#include "font/text.hpp"
 #include "gettext.hpp"
 #include "intro.hpp"
 #include "language.hpp"
 #include "log.hpp"
 #include "sound.hpp"
-#include "text.hpp"
 #include "video.hpp"
 
 static lg::log_domain log_engine("engine");

src/storyscreen/render.cpp

@@ -26,11 +26,11 @@
 #include "storyscreen/render.hpp"
 
 #include "config.hpp"
+#include "font/text.hpp"
 #include "image.hpp"
 #include "language.hpp"
 #include "sdl/rect.hpp"
 #include "sound.hpp"
-#include "text.hpp"
 #include "video.hpp"
 #include "widgets/button.hpp"
 

src/tools/sdl2/sdl2.cpp

@@ -22,7 +22,7 @@
 #include "sdl/texture.hpp"
 #include "sdl/window.hpp"
 #include "tools/sdl2/window.hpp"
-#include "text.hpp"
+#include "font/text.hpp"
 
 #include <SDL.h>
 

src/widgets/button.cpp

@@ -20,6 +20,7 @@
 
 #include "filesystem.hpp"
 #include "font/sdl_ttf.hpp"
+#include "font/text.hpp"
 #include "game_config.hpp"
 #include "game_errors.hpp"
 #include "image.hpp"
@@ -29,7 +30,6 @@
 #include "serialization/string_utils.hpp"
 #include "sound.hpp"
 #include "video.hpp"
-#include "text.hpp"
 #include "wml_separators.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>

src/widgets/label.cpp

@@ -16,9 +16,9 @@
 
 #include "global.hpp"
 
+#include "font/text.hpp"
 #include "widgets/label.hpp"
 #include "marked-up_text.hpp"
-#include "text.hpp"
 #include "video.hpp"
 
 namespace gui {