widelands-dev team mailing list archive

[cghislai <charlyghislain@xxxxxxxxx>]

cghislai has proposed merging lp:~widelands-dev/widelands/fh1 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #577888 in widelands: "Layouting large amount of rich text is slow"
  https://bugs.launchpad.net/widelands/+bug/577888

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228

I implemented the functions from fh in fh1. I removed the old fonthandler and replaced all references.
I tested a bunch of ui elements, the readmes/developped/licenses, the caret position. Everything seems ok.

I'm not sure if this should be merged already, or if all ui elements should be rewritten around the new font renderer.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1 into lp:widelands.

=== added file 'fonts/Widelands.LICENSE'
--- fonts/Widelands.LICENSE	1970-01-01 00:00:00 +0000
+++ fonts/Widelands.LICENSE	2013-07-26 22:01:28 +0000
@@ -0,0 +1,94 @@
+Copyright (c) 2006-2010, Peter Schwanemann (<http://www.drehatlas.de|Peter (AT) drehatlas (DOT) de>),
+with Reserved Font Name Widelands.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

=== added file 'fonts/Widelands.log'
--- fonts/Widelands.log	1970-01-01 00:00:00 +0000
+++ fonts/Widelands.log	2013-07-26 22:01:28 +0000
@@ -0,0 +1,51 @@
+1. FONTLOG for Widelands
+========================
+This file provides detailed information on the Widelands font software.
+This information should be distributed along with the Widelands fonts and
+any derivative works.
+
+
+2. Basic Font Information
+=========================
+The developement of the Widelands font was first started to create a logo for
+the Widelands-project, which develops a free, GPLed, realtime strategy game,
+similiar to BlueBytes Settler2(c). Nowadays the font gets more and more complete
+and should give the possibility to create imperial, fantasy and/or decorative
+logos, headings and other texts.
+
+The font is not created to be used in normal texts, as it is too complex and not
+that easy to read as a simple sans serif font. Anyway, you are free to use it
+for anything you want, as long as allowed by the Open Font License (take a look
+at the file "LICENSE" for more information).
+
+
+3. ChangeLog
+============
+1 February 2010 (Peter Schwanemann) -> Version 1.0.3.1
+- Addition of some more characters + minor improvements of some of the existing ones.
+
+21 October 2009 (Peter Schwanemann) -> Version 1.0.2.3
+- Minor improvements of @-sign and removing of "Preferred family" as suggested by David Ludlow
+
+16 July 2009 (Peter Schwanemann) -> Version 1.0.2.2
+- Added character for "sterling", "section", "onequarter", "onehalf" and
+  "threequarters". Fixed some other characters
+
+22 June 2008 (Peter Schwanemann) -> Version 1.0.2.1
+- Added default character, created new German "double s", fixed some other
+  characters
+
+18 January 2008 (Peter Schwanemann) -> Version 1.0.1.2
+- Improved and updated small and big S, Z and X.
+
+21 September 2007 (Peter Schwanemann) -> Version 1.0.1.1
+- First release of font "Widelands" under OFL
+
+
+4.  Acknowledgements
+====================
+(Here is where contributors can be acknowledged.
+If you make modifications be sure to add your name (N), email (E),
+web-address (W) and description (D). This list is sorted by last name in
+alphabetical order.)
+

=== added file 'fonts/Widelands.ttf'
Binary files fonts/Widelands.ttf	1970-01-01 00:00:00 +0000 and fonts/Widelands.ttf	2013-07-26 22:01:28 +0000 differ
=== removed file 'fonts/Widelands/FONTLOG'
--- fonts/Widelands/FONTLOG	2010-03-28 00:33:01 +0000
+++ fonts/Widelands/FONTLOG	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-1. FONTLOG for Widelands
-========================
-This file provides detailed information on the Widelands font software.
-This information should be distributed along with the Widelands fonts and
-any derivative works.
-
-
-2. Basic Font Information
-=========================
-The developement of the Widelands font was first started to create a logo for
-the Widelands-project, which develops a free, GPLed, realtime strategy game,
-similiar to BlueBytes Settler2(c). Nowadays the font gets more and more complete
-and should give the possibility to create imperial, fantasy and/or decorative
-logos, headings and other texts.
-
-The font is not created to be used in normal texts, as it is too complex and not
-that easy to read as a simple sans serif font. Anyway, you are free to use it
-for anything you want, as long as allowed by the Open Font License (take a look
-at the file "LICENSE" for more information).
-
-
-3. ChangeLog
-============
-1 February 2010 (Peter Schwanemann) -> Version 1.0.3.1
-- Addition of some more characters + minor improvements of some of the existing ones.
-
-21 October 2009 (Peter Schwanemann) -> Version 1.0.2.3
-- Minor improvements of @-sign and removing of "Preferred family" as suggested by David Ludlow
-
-16 July 2009 (Peter Schwanemann) -> Version 1.0.2.2
-- Added character for "sterling", "section", "onequarter", "onehalf" and
-  "threequarters". Fixed some other characters
-
-22 June 2008 (Peter Schwanemann) -> Version 1.0.2.1
-- Added default character, created new German "double s", fixed some other
-  characters
-
-18 January 2008 (Peter Schwanemann) -> Version 1.0.1.2
-- Improved and updated small and big S, Z and X.
-
-21 September 2007 (Peter Schwanemann) -> Version 1.0.1.1
-- First release of font "Widelands" under OFL
-
-
-4.  Acknowledgements
-====================
-(Here is where contributors can be acknowledged.
-If you make modifications be sure to add your name (N), email (E),
-web-address (W) and description (D). This list is sorted by last name in
-alphabetical order.)
-

=== removed file 'fonts/Widelands/LICENSE'
--- fonts/Widelands/LICENSE	2010-03-28 00:33:01 +0000
+++ fonts/Widelands/LICENSE	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-Copyright (c) 2006-2010, Peter Schwanemann (<http://www.drehatlas.de|Peter (AT) drehatlas (DOT) de>),
-with Reserved Font Name Widelands.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

=== renamed file 'src/graphic/font_handler.cc' => 'src/graphic/font_handler.cc.THIS'
=== renamed file 'src/graphic/font_handler.h' => 'src/graphic/font_handler.h.THIS'
=== modified file 'src/graphic/font_handler1.cc'
--- src/graphic/font_handler1.cc	2013-07-26 20:19:36 +0000
+++ src/graphic/font_handler1.cc	2013-07-26 22:01:28 +0000
@@ -21,6 +21,9 @@
 
 #include <boost/lexical_cast.hpp>
 #include <boost/utility.hpp>
+#include <boost/format.hpp>
+#include <boost/algorithm/string.hpp>
+#include <SDL_ttf.h>
 
 #include "graphic/graphic.h"
 #include "graphic/image.h"
@@ -33,7 +36,23 @@
 #include "graphic/text/sdl_ttf_font.h"
 #include "io/filesystem/filesystem.h"
 #include "wexception.h"
-
+#include "constants.h"
+
+<<<<<<< TREE
+=======
+#include "graphic.h"
+#include "image.h"
+#include "image_cache.h"
+#include "rendertarget.h"
+#include "surface.h"
+#include "surface_cache.h"
+#include "text/rt_errors.h"
+#include "text/rt_render.h"
+#include "text/sdl_ttf_font.h"
+#include "font.h"
+
+#include "font_handler1.h"
+>>>>>>> MERGE-SOURCE
 
 using namespace std;
 using namespace boost;
@@ -118,4 +137,114 @@
 
 IFont_Handler1 * g_fh1 = 0;
 
+void IFont_Handler1::draw_text
+	(RenderTarget& dst, const TextStyle& ts, Point dstpoint,
+	 const string& text, Align align, uint32_t caret)
+{
+	format f("<rt><p><font face=%1% size=%2% bold=%3% shadow=1 color=%|4$02x|%|5$02x|%|6$02x|>%7%</font></p></rt>");
+	if (ts.font) {
+		string fnt = TTF_FontFaceFamilyName(ts.font->get_ttf_font());
+		erase_all(fnt, " ");
+		erase_all(fnt, ".ttf");
+		f % fnt;
+	} else {
+		f % UI_FONT_NAME_NO_EXT;
+	}
+	f % (ts.font ? TTF_FontHeight(ts.font->get_ttf_font()) * 3 / 4 : UI_FONT_SIZE_SMALL);
+	f % (ts.bold ? "1" : "0");
+	f % int(ts.fg.r) % int(ts.fg.g) % int(ts.fg.b);
+	f % text;
+
+	const Image* text_im = render(f.str());
+	UI::correct_for_align(align, text_im->width(), text_im->height(), &dstpoint);
+	dst.blit(dstpoint, text_im);
+
+	if (caret > text.length()) {
+		return;
+	}
+	const string first_part_string = text.substr(0, caret);
+	uint32_t width;
+	uint32_t height;
+	get_size(ts, first_part_string, width, height);
+	const Image* caret_image = g_gr->images().get("pics/caret.png");
+	Point caretpt;
+	caretpt.x = dstpoint.x + width - caret_image->width();
+	caretpt.y = dstpoint.y + (height - caret_image->height()) / 2;
+	dst.blit(caretpt, caret_image);
+}
+
+uint32_t IFont_Handler1::draw_text_raw
+	(RenderTarget& dst, const TextStyle& ts, Point dstpoint, const std::string& text)
+{
+	format f("<rt><p><font face=%1% size=%2% bold=%3% shadow=1 color=%|4$02x|%|5$02x|%|6$02x|>%7%</font></p></rt>");
+	if (ts.font) {
+		string fnt = TTF_FontFaceFamilyName(ts.font->get_ttf_font());
+		erase_all(fnt, " ");
+		erase_all(fnt, ".ttf");
+		f % fnt;
+	} else {
+		f % UI_FONT_NAME_NO_EXT;
+	}
+	f % (ts.font ? TTF_FontHeight(ts.font->get_ttf_font()) * 3 / 4 : UI_FONT_SIZE_SMALL);
+	f % (ts.bold ? "1" : "0");
+	f % int(ts.fg.r) % int(ts.fg.g) % int(ts.fg.b);
+	f % text;
+
+	const Image* text_im = render(f.str());
+	dst.blit(dstpoint, text_im);
+	return text_im->width();
+}
+
+uint32_t IFont_Handler1::get_fontheight(const std::string& name, int32_t size)
+{
+	TTF_Font * const f = Font::get(name, size)->get_ttf_font();
+	const int32_t fontheight = TTF_FontHeight(f);
+	if (fontheight < 0)
+		throw wexception
+			("TTF_FontHeight returned a negative value, which does not have a "
+			 "known meaning.");
+	return fontheight;
+}
+
+void IFont_Handler1::get_size
+	(const TextStyle& ts, const std::string& text, uint32_t& w, uint32_t& h, uint32_t wrap)
+{
+	format f("<rt><p><font face=%1% size=%2% bold=%3% shadow=1 color=%|4$02x|%|5$02x|%|6$02x|>%7%</font></p></rt>");
+	if (ts.font) {
+		string fnt = TTF_FontFaceFamilyName(ts.font->get_ttf_font());
+		erase_all(fnt, " ");
+		erase_all(fnt, ".ttf");
+		f % fnt;
+	} else {
+		f % UI_FONT_NAME_NO_EXT;
+	}
+	f % (ts.font ? TTF_FontHeight(ts.font->get_ttf_font())* 3 / 4 : UI_FONT_SIZE_SMALL);
+	f % (ts.bold ? "1" : "0");
+	f % int(ts.fg.r) % int(ts.fg.g) % int(ts.fg.b);
+	f % text;
+
+	const Image* text_im = render(f.str(), wrap);
+	w = text_im->width();
+	h = text_im->height();
+}
+
+void IFont_Handler1::get_size
+	(const std::string& fontname, int32_t size, const std::string& text, uint32_t& w, uint32_t& h, uint32_t wrap)
+{
+	format f("<rt><p><font face=%1% size=%2% bold=%3% shadow=1 color=%|4$02x|%|5$02x|%|6$02x|>%7%</font></p></rt>");
+	string fnt(fontname);
+	erase_all(fnt, " ");
+	replace_all(fnt, ".ttf", "");
+	f % fnt;
+	f % (size * 3 / 4);
+	f % "1";
+	f % 255 % 255 % 255;
+	f % text;
+	const Image* text_im = render(f.str(), wrap);
+	w = text_im->width();
+	h = text_im->height();
+}
+
+
+
 } // namespace UI

=== modified file 'src/graphic/font_handler1.h'
--- src/graphic/font_handler1.h	2013-07-25 21:05:20 +0000
+++ src/graphic/font_handler1.h	2013-07-26 22:01:28 +0000
@@ -30,8 +30,10 @@
 class FileSystem;
 class Image;
 class Graphic;
+class RenderTarget;
 
 namespace UI {
+struct TextStyle;
 
 /**
  * Main class for string rendering. Manages the cache of pre-rendered strings.
@@ -45,6 +47,33 @@
 	 * ownership remains with this class. Will throw on error.
 	 */
 	virtual const Image* render(const std::string& text, uint16_t w = 0) = 0;
+
+	//FIXME: legacy support for raw text rendering
+	/// Deprecated, please use render
+	void draw_text
+		(RenderTarget &,
+		 const TextStyle &,
+		 Point dstpoint,
+		 const std::string & text,
+		 Align align = Align_CenterLeft,
+		 uint32_t caret = std::numeric_limits<uint32_t>::max());
+	/// Deprecated, please use render
+	uint32_t draw_text_raw(RenderTarget &, const TextStyle &, Point dstpoint, const std::string & text);
+
+	/// Deprecated, please use render
+	void get_size
+		(const TextStyle &,
+		 const std::string & text,
+		 uint32_t & w, uint32_t & h,
+		 uint32_t wrap = std::numeric_limits<uint32_t>::max());
+	/// Deprecated, please use render
+	void get_size
+		(const std::string & fontname, int32_t size,
+		 const std::string & text,
+		 uint32_t & w, uint32_t & h,
+		 uint32_t wrap = std::numeric_limits<uint32_t>::max());
+	/// Deprecated, please use re
+	uint32_t get_fontheight(const std::string & name, int32_t size);
 };
 
 // Create a new Font_Handler1. Ownership for the objects is not taken.

=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc	2013-07-26 20:19:36 +0000
+++ src/graphic/graphic.cc	2013-07-26 22:01:28 +0000
@@ -53,6 +53,20 @@
 #include "upcast.h"
 #include "wexception.h"
 
+<<<<<<< TREE
+=======
+#include "animation.h"
+#include "animation_gfx.h"
+#include "image.h"
+#include "image_loader_impl.h"
+#include "image_transformations.h"
+#include "render/gl_surface_screen.h"
+#include "render/sdl_surface.h"
+#include "rendertarget.h"
+#include "texture.h"
+
+#include "graphic.h"
+>>>>>>> MERGE-SOURCE
 
 using namespace std;
 
@@ -328,9 +342,6 @@
 	flush_maptextures();
 	flush_animations();
 	surface_cache_->flush();
-	// TODO: this should really not be needed, but currently is :(
-	if (UI::g_fh)
-		UI::g_fh->flush();
 
 	if (g_opengl)
 		GLSurfaceTexture::Cleanup();

=== modified file 'src/graphic/richtext.cc'
--- src/graphic/richtext.cc	2013-07-26 20:19:36 +0000
+++ src/graphic/richtext.cc	2013-07-26 22:01:28 +0000
@@ -19,11 +19,18 @@
 
 #include "graphic/richtext.h"
 
+<<<<<<< TREE
 #include "graphic/font.h"
 #include "graphic/font_handler.h"
 #include "graphic/graphic.h"
 #include "graphic/image.h"
 #include "graphic/rendertarget.h"
+=======
+#include "font.h"
+#include "font_handler1.h"
+#include "graphic.h"
+#include "image.h"
+>>>>>>> MERGE-SOURCE
 #include "rect.h"
 #include "text_parser.h"
 
@@ -72,7 +79,7 @@
 	virtual void draw(RenderTarget & dst)
 	{
 		assert(words.size());
-		uint32_t x = g_fh->draw_text_raw(dst, style, Point(0, 0), words[0]);
+		uint32_t x = g_fh1->draw_text_raw(dst, style, Point(0, 0), words[0]);
 
 		std::vector<std::string>::const_iterator it = words.begin() + 1;
 		if (it != words.end()) {
@@ -80,10 +87,10 @@
 
 			do {
 				if (style.underline)
-					x += g_fh->draw_text_raw(dst, style, Point(x, 0), " ");
+					x += g_fh1->draw_text_raw(dst, style, Point(x, 0), " ");
 				else
 					x += spacewidth;
-				x += g_fh->draw_text_raw(dst, style, Point(x, 0), *it++);
+				x += g_fh1->draw_text_raw(dst, style, Point(x, 0), *it++);
 			} while (it != words.end());
 		}
 	}

=== modified file 'src/graphic/wordwrap.cc'
--- src/graphic/wordwrap.cc	2013-07-26 20:19:36 +0000
+++ src/graphic/wordwrap.cc	2013-07-26 22:01:28 +0000
@@ -23,8 +23,12 @@
 
 #include "graphic/wordwrap.h"
 
+<<<<<<< TREE
 #include "graphic/font_handler.h"
 #include "graphic/rendertarget.h"
+=======
+#include "font_handler1.h"
+>>>>>>> MERGE-SOURCE
 #include "log.h"
 
 namespace UI {
@@ -283,7 +287,7 @@
 		if (where.y >= dst.height() || int32_t(where.y + fontheight) <= 0)
 			continue;
 
-		g_fh->draw_text
+		g_fh1->draw_text
 			(dst, m_style, where, m_lines[line].text, Align(align & Align_Horizontal),
 			 line == caretline ? caretpos : std::numeric_limits<uint32_t>::max());
 	}

=== modified file 'src/logic/building.cc'
--- src/logic/building.cc	2013-07-26 20:19:36 +0000
+++ src/logic/building.cc	2013-07-26 22:01:28 +0000
@@ -27,7 +27,7 @@
 #include "economy/flag.h"
 #include "economy/request.h"
 #include "graphic/font.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"

=== modified file 'src/logic/editor_game_base.cc'
--- src/logic/editor_game_base.cc	2013-07-26 20:19:36 +0000
+++ src/logic/editor_game_base.cc	2013-07-26 22:01:28 +0000
@@ -24,7 +24,7 @@
 
 #include "economy/flag.h"
 #include "economy/road.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "i18n.h"
 #include "logic/areawatcher.h"

=== modified file 'src/ui_basic/button.cc'
--- src/ui_basic/button.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/button.cc	2013-07-26 22:01:28 +0000
@@ -20,7 +20,7 @@
 #include "ui_basic/button.h"
 
 #include "graphic/font.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/image.h"
 #include "graphic/image_transformations.h"
 #include "graphic/rendertarget.h"
@@ -193,7 +193,7 @@
 		ts.bold = true;
 		ts.fg = m_enabled ? UI_FONT_CLR_FG : UI_FONT_CLR_DISABLED;
 
-		UI::g_fh->draw_text
+		UI::g_fh1->draw_text
 			(dst, ts, Point(get_w() / 2, get_h() / 2),
 			 m_title, Align_Center,
 			 m_draw_caret ? m_title.length() : std::numeric_limits<uint32_t>::max());

=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/editbox.cc	2013-07-26 22:01:28 +0000
@@ -24,7 +24,7 @@
 #include <SDL_keysym.h>
 
 #include "graphic/font.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/rendertarget.h"
 #include "helper.h"
 #include "ui_basic/mouse_constants.h"
@@ -473,7 +473,7 @@
 
 	pos.x += m->scrolloffset;
 
-	UI::g_fh->draw_text
+	UI::g_fh1->draw_text
 		(dst,
 		 TextStyle::makebold(Font::get(m->fontname, m->fontsize), m->fontcolor),
 		 pos,
@@ -493,8 +493,8 @@
 	uint32_t rightw;
 	uint32_t tmp;
 
-	UI::g_fh->get_size(m->fontname, m->fontsize, leftstr, leftw, tmp);
-	UI::g_fh->get_size(m->fontname, m->fontsize, rightstr, rightw, tmp);
+	UI::g_fh1->get_size(m->fontname, m->fontsize, leftstr, leftw, tmp);
+	UI::g_fh1->get_size(m->fontname, m->fontsize, rightstr, rightw, tmp);
 
 	int32_t caretpos;
 

=== modified file 'src/ui_basic/helpwindow.cc'
--- src/ui_basic/helpwindow.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/helpwindow.cc	2013-07-26 22:01:28 +0000
@@ -23,7 +23,7 @@
 
 #include "constants.h"
 #include "graphic/font.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "i18n.h"
 #include "io/filesystem/layered_filesystem.h"

=== modified file 'src/ui_basic/icongrid.cc'
--- src/ui_basic/icongrid.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/icongrid.cc	2013-07-26 22:01:28 +0000
@@ -17,10 +17,21 @@
  *
  */
 
+<<<<<<< TREE
 #include "ui_basic/icongrid.h"
 
 #include "constants.h"
 #include "graphic/font_handler.h"
+=======
+#include "icongrid.h"
+
+#include "log.h"
+
+#include "button.h"
+#include "mouse_constants.h"
+
+#include "graphic/font_handler1.h"
+>>>>>>> MERGE-SOURCE
 #include "graphic/rendertarget.h"
 #include "log.h"
 #include "ui_basic/button.h"

=== modified file 'src/ui_basic/listselect.cc'
--- src/ui_basic/listselect.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/listselect.cc	2013-07-26 22:01:28 +0000
@@ -26,7 +26,7 @@
 #include "constants.h"
 #include "container_iterate.h"
 #include "graphic/font.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "log.h"
@@ -49,7 +49,7 @@
 	 Align const align, bool const show_check)
 	:
 	Panel(parent, x, y, w, h),
-	m_lineheight(g_fh->get_fontheight(UI_FONT_SMALL)),
+	m_lineheight(g_fh1->get_fontheight(UI_FONT_SMALL)),
 	m_scrollbar      (this, get_w() - 24, 0, 24, h, false),
 	m_scrollpos     (0),
 	m_selection     (no_selection_index()),
@@ -65,9 +65,9 @@
 	m_align = static_cast<Align>(align & Align_Horizontal);
 
 	m_scrollbar.moved.connect(boost::bind(&BaseListselect::set_scrollpos, this, _1));
-	m_scrollbar.set_singlestepsize(g_fh->get_fontheight(m_fontname, m_fontsize));
+	m_scrollbar.set_singlestepsize(g_fh1->get_fontheight(m_fontname, m_fontsize));
 	m_scrollbar.set_pagesize
-		(h - 2 * g_fh->get_fontheight(m_fontname, m_fontsize));
+		(h - 2 * g_fh1->get_fontheight(m_fontname, m_fontsize));
 	m_scrollbar.set_steps(1);
 
 	if (show_check) {
@@ -131,12 +131,12 @@
 	er->tooltip = tooltip_text;
 	uint32_t entry_height = 0;
 	if (!pic) {
-		entry_height = g_fh->get_fontheight(m_fontname, m_fontsize);
+		entry_height = g_fh1->get_fontheight(m_fontname, m_fontsize);
 	} else {
 		uint16_t w = pic->width();
 		uint16_t h = pic->height();
-		entry_height = (h >= g_fh->get_fontheight(m_fontname, m_fontsize))
-			? h : g_fh->get_fontheight(m_fontname, m_fontsize);
+		entry_height = (h >= g_fh1->get_fontheight(m_fontname, m_fontsize))
+			? h : g_fh1->get_fontheight(m_fontname, m_fontsize);
 		if (m_max_pic_width < w)
 			m_max_pic_width = w;
 	}
@@ -173,12 +173,12 @@
 
 	uint32_t entry_height = 0;
 	if (!pic)
-		entry_height = g_fh->get_fontheight(m_fontname, m_fontsize);
+		entry_height = g_fh1->get_fontheight(m_fontname, m_fontsize);
 	else {
 		uint16_t w = pic->width();
 		uint16_t h = pic->height();
-		entry_height = (h >= g_fh->get_fontheight(m_fontname, m_fontsize))
-			? h : g_fh->get_fontheight(m_fontname, m_fontsize);
+		entry_height = (h >= g_fh1->get_fontheight(m_fontname, m_fontsize))
+			? h : g_fh1->get_fontheight(m_fontname, m_fontsize);
 		if (m_max_pic_width < w)
 			m_max_pic_width = w;
 	}
@@ -388,13 +388,13 @@
 			1;
 
 		// Horizontal center the string
-		UI::g_fh->draw_text
+		UI::g_fh1->draw_text
 			(dst,
 			 TextStyle::makebold(Font::get(m_fontname, m_fontsize), er.use_clr ? er.clr : UI_FONT_CLR_FG),
 			 Point
 			 	(x,
 			 	 y +
-			 	 (get_lineheight() - g_fh->get_fontheight(m_fontname, m_fontsize))
+			 	 (get_lineheight() - g_fh1->get_fontheight(m_fontname, m_fontsize))
 			 	 /
 			 	 2),
 			 er.name,

=== modified file 'src/ui_basic/messagebox.cc'
--- src/ui_basic/messagebox.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/messagebox.cc	2013-07-26 22:01:28 +0000
@@ -20,7 +20,7 @@
 #include "ui_basic/messagebox.h"
 
 #include "constants.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "i18n.h"
 #include "ui_basic/button.h"
@@ -65,10 +65,10 @@
 	std::string font = d->textarea->get_font_name();
 	int32_t fontsize = d->textarea->get_font_size();
 
-	UI::g_fh->get_size(font, fontsize, text, width, height, maxwidth);
+	UI::g_fh1->get_size(font, fontsize, text, width, height, maxwidth);
 	// stupid heuristic to avoid excessively long lines
 	if (height < 2U * fontsize)
-		UI::g_fh->get_size(font, fontsize, text, width, height, maxwidth / 2);
+		UI::g_fh1->get_size(font, fontsize, text, width, height, maxwidth / 2);
 
 	width += 10 + 2 * d->textarea->scrollbar_w();
 	if (width < 100)

=== modified file 'src/ui_basic/multilineeditbox.cc'
--- src/ui_basic/multilineeditbox.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/multilineeditbox.cc	2013-07-26 22:01:28 +0000
@@ -22,7 +22,7 @@
 #include <boost/bind.hpp>
 
 #include "constants.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/rendertarget.h"
 #include "graphic/wordwrap.h"
 #include "helper.h"

=== modified file 'src/ui_basic/multilinetextarea.cc'
--- src/ui_basic/multilinetextarea.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/multilinetextarea.cc	2013-07-26 22:01:28 +0000
@@ -22,7 +22,7 @@
 #include <boost/bind.hpp>
 
 #include "constants.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/richtext.h"
 #include "graphic/wordwrap.h"
 
@@ -59,8 +59,8 @@
 
 	m_scrollbar.moved.connect(boost::bind(&Multiline_Textarea::scrollpos_changed, this, _1));
 
-	m_scrollbar.set_singlestepsize(g_fh->get_fontheight(UI_FONT_SMALL));
-	m_scrollbar.set_pagesize(h - 2 * g_fh->get_fontheight(UI_FONT_BIG));
+	m_scrollbar.set_singlestepsize(g_fh1->get_fontheight(UI_FONT_SMALL));
+	m_scrollbar.set_pagesize(h - 2 * g_fh1->get_fontheight(UI_FONT_BIG));
 	m_scrollbar.set_steps(1);
 	m_scrollbar.set_force_draw(always_show_scrollbar);
 

=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/panel.cc	2013-07-26 22:01:28 +0000
@@ -20,7 +20,7 @@
 #include "ui_basic/panel.h"
 
 #include "constants.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"

=== modified file 'src/ui_basic/progresswindow.cc'
--- src/ui_basic/progresswindow.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/progresswindow.cc	2013-07-26 22:01:28 +0000
@@ -26,7 +26,7 @@
 #include "constants.h"
 #include "container_iterate.h"
 #include "graphic/font.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/image_transformations.h"
 #include "graphic/rendertarget.h"
@@ -68,7 +68,7 @@
 		// (Re-)Load background graphics
 		m_background_pic = ImageTransformations::resize(g_gr->images().get(m_background), xres, yres);
 
-		const uint32_t h = g_fh->get_fontheight (UI_FONT_SMALL);
+		const uint32_t h = g_fh1->get_fontheight (UI_FONT_SMALL);
 		m_label_rectangle.x = xres / 4;
 		m_label_rectangle.w = xres / 2;
 		m_label_rectangle.y =
@@ -134,7 +134,7 @@
 
 	UI::TextStyle ts(UI::TextStyle::ui_small());
 	ts.fg = PROGRESS_FONT_COLOR_FG;
-	UI::g_fh->draw_text(rt, ts, m_label_center, description, Align_Center);
+	UI::g_fh1->draw_text(rt, ts, m_label_center, description, Align_Center);
 	g_gr->update_rectangle(m_label_rectangle);
 
 #ifdef _WIN32

=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/slider.cc	2013-07-26 22:01:28 +0000
@@ -21,9 +21,15 @@
 #include <cmath>
 
 #include "graphic/font.h"
+<<<<<<< TREE
 #include "graphic/font_handler.h"
 #include "graphic/rendertarget.h"
 #include "ui_basic/mouse_constants.h"
+=======
+#include "graphic/font_handler1.h"
+
+#include "slider.h"
+>>>>>>> MERGE-SOURCE
 
 namespace UI {
 
@@ -590,7 +596,7 @@
 	uint32_t gap_n = get_w() / labels.size();
 
 	for (uint32_t i = 0; i < labels.size(); i++) {
-		UI::g_fh->draw_text
+		UI::g_fh1->draw_text
 			(dst, ts,
 			 Point(gap_1 + i * gap_n, get_h() + 2),
 			 labels[i], UI::Align_BottomCenter);

=== modified file 'src/ui_basic/table.cc'
--- src/ui_basic/table.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/table.cc	2013-07-26 22:01:28 +0000
@@ -23,8 +23,12 @@
 
 #include "container_iterate.h"
 #include "graphic/font.h"
+<<<<<<< TREE
 #include "graphic/font_handler.h"
 #include "graphic/font_handler1.h"
+=======
+#include "graphic/font_handler1.h"
+>>>>>>> MERGE-SOURCE
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "text_layout.h"
@@ -52,7 +56,7 @@
 	m_fontname        (UI_FONT_NAME),
 	m_fontsize        (UI_FONT_SIZE_SMALL),
 	m_headerheight    (15),
-	m_lineheight      (g_fh->get_fontheight(m_fontname, m_fontsize)),
+	m_lineheight      (g_fh1->get_fontheight(m_fontname, m_fontsize)),
 	m_scrollbar       (0),
 	m_scrollpos       (0),
 	m_selection       (no_selection_index()),
@@ -130,7 +134,7 @@
 				 false);
 		m_scrollbar->moved.connect(boost::bind(&Table::set_scrollpos, this, _1));
 		m_scrollbar->set_steps(1);
-		uint32_t const lineheight = g_fh->get_fontheight(m_fontname, m_fontsize);
+		uint32_t const lineheight = g_fh1->get_fontheight(m_fontname, m_fontsize);
 		m_scrollbar->set_singlestepsize(lineheight);
 		m_scrollbar->set_pagesize(get_h() - lineheight);
 	}
@@ -448,7 +452,7 @@
 Table<void *>::Entry_Record & Table<void *>::add
 	(void * const entry, const bool do_select)
 {
-	int32_t entry_height = g_fh->get_fontheight(m_fontname, m_fontsize);
+	int32_t entry_height = g_fh1->get_fontheight(m_fontname, m_fontsize);
 	if (entry_height > m_lineheight)
 		m_lineheight = entry_height;
 

=== modified file 'src/ui_basic/textarea.cc'
--- src/ui_basic/textarea.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/textarea.cc	2013-07-26 22:01:28 +0000
@@ -19,7 +19,7 @@
 
 #include "ui_basic/textarea.h"
 
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 
 namespace UI {
 
@@ -148,7 +148,7 @@
 		 	 m_align & Align_VCenter ?
 		 	 get_h() / 2 : m_align & Align_Bottom ? get_h() : 0);
 
-		g_fh->draw_text(dst, m_textstyle, anchor, m_text, m_align);
+		g_fh1->draw_text(dst, m_textstyle, anchor, m_text, m_align);
 	}
 }
 

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2013-07-26 19:16:51 +0000
+++ src/wlapplication.cc	2013-07-26 22:01:28 +0000
@@ -41,7 +41,6 @@
 #include "computer_player.h"
 #include "editor/editorinteractive.h"
 #include "gamesettings.h"
-#include "graphic/font_handler.h"
 #include "graphic/font_handler1.h"
 #include "i18n.h"
 #include "io/dedicated_log.h"
@@ -290,7 +289,6 @@
 			throw wexception
 				("True Type library did not initialize: %s\n", TTF_GetError());
 
-		UI::g_fh = new UI::Font_Handler();
 		UI::g_fh1 = UI::create_fonthandler(g_gr, g_fs);
 	} else
 		g_gr = 0;
@@ -313,10 +311,6 @@
 	shutdown_hardware();
 	shutdown_settings();
 
-	assert(UI::g_fh);
-	delete UI::g_fh;
-	UI::g_fh = 0;
-
 	assert(UI::g_fh1);
 	delete UI::g_fh1;
 	UI::g_fh1 = 0;

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2013-07-26 20:19:36 +0000
+++ src/wui/interactive_player.cc	2013-07-26 22:01:28 +0000
@@ -29,8 +29,22 @@
 
 #include "debugconsole.h"
 #include "economy/flag.h"
+<<<<<<< TREE
 #include "game_io/game_loader.h"
 #include "graphic/font_handler.h"
+=======
+#include "encyclopedia_window.h"
+#include "fieldaction.h"
+#include "graphic/font_handler1.h"
+#include "game_chat_menu.h"
+#include "game_io/game_loader.h"
+#include "game_main_menu.h"
+#include "game_main_menu_save_game.h"
+#include "game_message_menu.h"
+#include "game_objectives_menu.h"
+#include "game_options_menu.h"
+#include "general_statistics_menu.h"
+>>>>>>> MERGE-SOURCE
 #include "helper.h"
 #include "i18n.h"
 #include "logic/building.h"

=== modified file 'src/wui/transport_ui.cc'
--- src/wui/transport_ui.cc	2013-07-26 20:19:36 +0000
+++ src/wui/transport_ui.cc	2013-07-26 22:01:28 +0000
@@ -18,7 +18,7 @@
  */
 
 #include "economy/economy.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "logic/item_ware_descr.h"

=== modified file 'src/wui/waresdisplay.cc'
--- src/wui/waresdisplay.cc	2013-07-26 20:19:36 +0000
+++ src/wui/waresdisplay.cc	2013-07-26 22:01:28 +0000
@@ -25,7 +25,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include "graphic/font.h"
-#include "graphic/font_handler.h"
+#include "graphic/font_handler1.h"
 #include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"

=== modified file 'tribes/atlanteans/fisher/conf'
--- tribes/atlanteans/fisher/conf	2013-03-02 20:35:18 +0000
+++ tribes/atlanteans/fisher/conf	2013-07-26 22:01:28 +0000
@@ -9,7 +9,7 @@
 0=findspace size:any radius:7 resource:fish
 1=walk coords
 2=playFX ../../../sound/fisher/fisher_throw_net 192
-3=mine fish 1
+3=mine fish 0
 4=animation fishing 3000
 5=playFX ../../../sound/fisher/fisher_pull_net 192
 6=createitem fish

=== modified file 'txts/COPYING'
--- txts/COPYING	2012-12-16 19:08:53 +0000
+++ txts/COPYING	2013-07-26 22:01:28 +0000
@@ -93,13 +93,13 @@
 _"To do so, attach the following notices to the program.  It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the copyright line and a pointer to where the full notice is found."
 "<br>"
 "<br>"
-_"<one line to give the program's name and a brief idea of what it does.><br>Copyright (C) <year>  <name of author><br><br>This program is free software; you can redistribute it and/or modify<br>it under the terms of the GNU General Public License as published by<br>the Free Software Foundation; either version 2 of the License, or<br>(at your option) any later version.<br><br>This program is distributed in the hope that it will be useful,<br>but WITHOUT ANY WARRANTY; without even the implied warranty of<br>MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the<br>GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License<br>along with this program; if not, write to the Free Software<br>Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA<br><br><br>Also add information on how to contact you by electronic and paper mail."
+_"\<one line to give the program's name and a brief idea of what it does.\><br>Copyright (C) \<year\>  \<name of author\><br><br>This program is free software; you can redistribute it and/or modify<br>it under the terms of the GNU General Public License as published by<br>the Free Software Foundation; either version 2 of the License, or<br>(at your option) any later version.<br><br>This program is distributed in the hope that it will be useful,<br>but WITHOUT ANY WARRANTY; without even the implied warranty of<br>MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the<br>GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License<br>along with this program; if not, write to the Free Software<br>Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA<br><br><br>Also add information on how to contact you by electronic and paper mail."
 "<br><br>"
 _"If the program is interactive, make it output a short notice like this<br>when it starts in an interactive mode:<br><br>Gnomovision version 69, Copyright (C) year  name of author<br>Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.<br>This is free software, and you are welcome to redistribute it<br>under certain conditions; type `show c' for details."
 "<br><br>"
 _"The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License.  Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.<br><br>You should also get your employer (if you work as a programmer) or your school, if any, to sign a copyright disclaimer for the program, if necessary.  Here is a sample; alter the names:"
 "<br><br>"
-_"Yoyodyne, Inc., hereby disclaims all copyright interest in the program<br>`Gnomovision' (which makes passes at compilers) written by James Hacker.<br><br><signature of Ty Coon>, 1 April 1989<br>Ty Coon, President of Vice"
+_"Yoyodyne, Inc., hereby disclaims all copyright interest in the program<br>`Gnomovision' (which makes passes at compilers) written by James Hacker.<br><br>\<signature of Ty Coon\>, 1 April 1989<br>Ty Coon, President of Vice"
 "<br><br>"
 _"This General Public License does not permit incorporating your program into proprietary programs.  If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library.  If this is what you want to do, use the GNU Library General Public License instead of this License."
 "</p></rt>""

=== modified file 'txts/README'
--- txts/README	2013-01-21 09:52:31 +0000
+++ txts/README	2013-07-26 22:01:28 +0000
@@ -115,7 +115,7 @@
 "</p>"
 "<p line-spacing=3 font-size=12>"
 "<br><br>"
-_"If you want to report bugs, please send your report to the mailing list, <widelands-public@xxxxxxxxxxxxxxxxxxxx><br>To subscribe, visit the following page:"
+_"If you want to report bugs, please send your report to the mailing list, \<widelands-public@xxxxxxxxxxxxxxxxxxxx\><br>To subscribe, visit the following page:"
 "<br>"
 "http://lists.sourceforge.net/mailman/listinfo/widelands-public";
 "<br>"

=== modified file 'txts/developers'
--- txts/developers	2013-07-10 05:09:06 +0000
+++ txts/developers	2013-07-26 22:01:28 +0000
@@ -115,23 +115,23 @@
 ""
 _ "Musicians"
 "</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Kristian</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> MiddleFinger</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Valerio Orlandini (Symbiosis)</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Barry van Oudtshoorn (barryvan)</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Jan Bruns (Solatis)</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Nikola Whallon (Saturn)</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Joshua O'Leary (Joshun)</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Kristian</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> MiddleFinger</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Valerio Orlandini (Symbiosis)</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Barry van Oudtshoorn (barryvan)</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Jan Bruns (Solatis)</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Nikola Whallon (Saturn)</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Joshua O'Leary (Joshun)</p></rt>"
 "<rt text-align=left><p font-size=24 font-decoration=bold font-face=DejaVuSerif font-color=f4a131><br>"
 ""
 ""
 _ "Sound Effects"
 "</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Stefan de Konik</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Peter Schwanemann (Nasenbaer)</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Stephan</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Adam Piggott (_aD)</p></rt>"
-"<rt image=pics/workarea2cumulative.png image-align=left text-align=left><p font-size=12> Stanisław Gackowski (Soeb)</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Stefan de Konik</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Peter Schwanemann (Nasenbaer)</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Stephan</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Adam Piggott (_aD)</p></rt>"
+"<rt image=pics/workarea123.png image-align=left text-align=left><p font-size=12> Stanisław Gackowski (Soeb)</p></rt>"
 "<rt text-align=left><p font-size=24 font-decoration=bold font-face=DejaVuSerif font-color=f4a131><br>"
 ""
 ""