Merge lp:~widelands-dev/widelands/fh1 into lp:widelands

[cghislai]

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.

[SirVer (sirver)]

This is a really good start. I think the deprecated methods should vanish. I think this should be done before merging.

Of course the old <rt> renderer should be killed as well and the new one used in all places instead. We should not need to deal with rich text in code anymore, all formatting should be done in the new renderer. For this the new one needs to learn to render raw text and caret's as well.

Also, the Font:: methods that are now used should somehow be incorporated into the new rich text renderer - I am not too sure how this can be done. Maybe by rendering a simple string and returning its size.

review: Needs Fixing

[cghislai (charlyghislain)]

Currently I use that method, rendering a test string to know the font height.

I'm coming to the multiline edit box, and I was thinking, should the wordwarpper be kept around? It is currently only used in the multiline textarea and the multiline edit box. For the multiline textarea, i think the wrapping done by the renderer will be sufficient. Now for editbox, in which caret must be rendered, that will be an issue. The multiline textarea is only used in one place in the map editor.

According to me, it would be nice to allow rendering of the caret further down in the new renderer and get rid of this wordwrap class. I was thinking of a caret tag, but it will interfere with surface caching. I'm just asking if you think it is a viable solution, and if you have some guess of where to implement that.

[SirVer (sirver)]

> Currently I use that method, rendering a test string to know the font height.

As mentioned, I think with the caching this approach is fine.

> I'm coming to the multiline edit box, and I was thinking, should the
> wordwarpper be kept around?
No, I think it should definitively be killed. The one in the richtext render should be strictly superior to what we have in wordwrap.

> It is currently only used in the multiline
> textarea and the multiline edit box. For the multiline textarea, i think the
> wrapping done by the renderer will be sufficient. Now for editbox, in which
> caret must be rendered, that will be an issue. The multiline textarea is only
> used in one place in the map editor.

This is the hardest thing to change imho. I am not really sure how to proceed either - I was thinking about a <caret> tag too. It might not be a problem - a human types at most 4-5 chars per second, we should be able to rerender the text this often. And the cache will just overflow with useless cached images, but eventually clear out. So I'd try this approach first.

> According to me, it would be nice to allow rendering of the caret further down
> in the new renderer and get rid of this wordwrap class. I was thinking of a
> caret tag, but it will interfere with surface caching. I'm just asking if you
> think it is a viable solution, and if you have some guess of where to
> implement that.

Okay, so I think I commented on this before reading this paragraph. As mentioned, I find this a difficult design decision and I am not sure if the tag is viable, but I have no clear path forward that is not using a tag, so I suggest trying that.

Again, thanks for working on this Charly!

[cghislai (charlyghislain)]

I tried a caret tag renderer. It works fine except it seems there is a 1-pixel space inserted between two text nodes, even if the caret has zero-size. So I'm not quite sure it is the best option.
I still have other options to try, like removing the tag and continuing parsing the text while remembering somehow position of the caret, but it feels dirty.

Also, as I was trying to port the multiline editbox, I realized that if we want to support the direction keys, home end & co, we should definitely add some way to get information about the wrapping. I was thinking of a pointer to a wrapinginfo object that could be passed all the way down to the layouting node, which would fill it with data. We could put coords of every text node in there, including the caret placeholder, so that rendering can be done on top afterwards. Its still just an idea, if you have another one please share!

[SirVer (sirver)]

I do not care about the 1 pixel thingy. But you are right, cursor movements should not be handled by the text renderer. So the solution might really be to pass the layout boxes up again - then the <cursor> node might not be needed. I kinda like this solution, though I also feel that the separation of concerns is no longer true then - but so what?

[cghislai (charlyghislain)]

After a few tries, I finally found a way to get the layout info in a not-so-dirty way.
So all basic widgets are ported now, with some fixes still needed: non-rendered whitespace makes the caret behaviour quite strange, and except of cropping when text doesnt fit width, a line break should be introduced.

I will then start to start cleaning everything. So now comes the question - should I use the font specified in the game option everywhere? I think it makes sense. Especially since, as for now, all widgets use the same font in all places - no special font in ui_fsmenu is used anymore.

[Nasenbaer (nasenbaer)]

> should I use the font specified in the game option everywhere? I think it makes sense. Especially since, as for now, all widgets use the same font in all places - no special font in ui_fsmenu is used anymore.

That would be a good thing, yes. I would However keep special font where explicitly defined (e.g. Widelands.ttf used for "Widelands")

Maybe it would be good to add a <rt text-style=sans / serif> in the long term and make sans and serif selectable? - than we could get rid of almost all explicite font definitions (but maybe Widelands.ttf) as the font renderer would set the appropriate font connected to sans resp. serif - but well I am getting off topic sorry - this should go to a bug report / wishlist item

[cghislai (charlyghislain)]

> Maybe it would be good to add a <rt text-style=sans / serif> in the long term and make sans and serif selectable?
Yes, why not. However, as I understood from reading some bug reports, custom font support were implemented so that users using exotic locales could find a font that render text correctly. It might not be easy to switch serif/sans in those cases, except if we allow custom serif and custom sans font.

I see TTF handle bold/italic styles, so I wonder why it is handled in the code by using different fonts. This is not going to work if using the custom fonts. The bold faces processed by SDL_TTF do not look that bad imo.

If no objection, I am going to store the font filename in all case in the options, keeping the UI_FONT_NAME constant only to get the default value, and let TTF handle all the styles. The derived fonts in /fonts will be removed.

[Nasenbaer (nasenbaer)]

Seems that this is a matter of taste - I completely (like 100%) agree with you, however as far as I remember, SirVer does not (e.g. take a look at #1 of https://bugs.launchpad.net/widelands/+bug/1184185 )

For me it seems much better to have a simple option, and everything is working based upon that setting but working way than to to

concerning:
> However, as I understood from reading some bug reports, custom font support were implemented so that users using exotic locales could find a font that render text correctly. It might not be easy to switch serif/sans in those cases, except if we allow custom serif and custom sans font.

I see no problem here - if I write a text and decide to make it "more beautiful" by using a mixture of sans and serif, this decission is of course based upon Latin characters. So if e.g. someone reading the translated text in arabic and sets both styles - serif and sans - to the same TTF font, there is no problem with it (to be more specific: it isn't even a problem if someone is doing this in the untranslated version). Of course this sounds like "more clutter options", but we can still add it to the advanced options menu, as the font selection is at the moment + (and that's the major PLUS for me) We would be simply able to use serif and sans styles without having to worry about which ttf will actually be used. -> and after all that system will be much easier to maintain if for some reason the default font will be changed or removed at some point.

[Nasenbaer (nasenbaer)]

> For me it seems much better to have a simple option, and everything is working based upon that setting but working way than to to

seems I stopped there in the middle of a thought, but I guess everything below explains my further thoughts pretty much ;) - it's just that the whole system gets better maintainable when we use the italic/bold/underline functions of SDL_TTF and therefore don't have to take care about the fonts - e.g. one problem is that none of the ttfs is complete in matter of the available glyphs, but even worth the "completenes" differes between the different styles - "normal" is most complete, "italic" less, etc...

[SirVer (sirver)]

I am very pressed on time and have not read through all the comments yet. I have some strong opinions on some of those though, and I will comment as soon as I find 30 minutes to read through all of it. Just FYI :).

[SirVer (sirver)]

> I see TTF handle bold/italic styles, so I wonder why it is handled in the code by using different fonts. This is not going to work if using the custom fonts. The bold faces processed by SDL_TTF do not look that bad imo.

What SDL_TTF is when rendering bold is to render the same text twice with an offset of a pixel - this looks good often enough, but not always. With some fonts it gets completely unreadable. The same for italic: it renders each character at an angle. It is a fragile system that we do not control. When you use bold/italic in your text processor, it will only work if there is a bold/italic ttf installed on your system - and imho that is a good thing. Reverting back to SDL_TTF rendering is a step backwards imho.

Frankly, letting the user choose a font is not a good idea. First: we have no control what characters are supported in the fonts the user chooses which sets us up for incompatibilities which we cannot fix ourselves. Second: Widelands does not deal well with different font sizes in different places, this can be fixed, but it is much easier if we commit ourselves to a fixed number of fonts that we will support and ship with Widelands.

This leads me to the following suggestion: Why not link language codes to fonts and ship them with Widelands? We then have complete control over how Widelands looks and renders, which chars it supports and we can get rid of this option. I could see that we then also change the <font> tag to only allow style changes as you are suggesting and not change the font that is used for rendering.

Just to manage expectations: I am in vacations for the next two weeks. I might have access to email, but I will not check them regularly, so you will not hear from me much till beginning of September.

[SirVer (sirver)]

Btw, i also looked at richtext_test branch and I think it should be merged. You made it more general than I ever did, even if it does not completely work for you, it is better than what was there before. We can fix the tests when we want to add new features to the renderer.

[cghislai (charlyghislain)]

I agree with the solution of linking fonts to locales. Things will be simplier. We could therefore remove the face attribute of the font tag, and indeed introduce new ones such as condensed, sherif and so on.

Apart for that point, the c++ code is almost completely using the new renderer correctly now. The biggest piece of work remaining is for all the extra texts, still using the old tag syntax - even when it's through the lua wrapper. It is a lot of work to rewrite all texts.
I think we could start by improving the lua interface to make it more abstract. Currently, several attributes are passed in, and they are not allowed by the new syntax.

I think the rewrite of the README should wait for this to happen.

[SirVer (sirver)]

sounds good. do you think we should rush this before b18 or wait till after b18? It seems like rushing is dangerous but could be beneficial. Your call anyways - I think I will not be able to help a lot.

About rewriting the texts: All scenario texts should not need a rewrite, they do not use the rich text syntax explicitly. Only the ingame texts need rewrites, that is not too much to do imho.

[cghislai (charlyghislain)]

No rush - I won"t have much time neither before release. And while not using the rich text syntax explicitly, i have the feeling the scenario texts will need to be reworked as well because the lua formatting interface does not abstract completely the old renderer.

[Nasenbaer (nasenbaer)]

Just a comment, an important though:

This branch is linked to be the fix for two high rated bugs, which should definitely be fixed for build18. Therefore I guess a soon merge (if nothing speaks against it) would be a good idea. If you decide to not merge before build18 feature freeze, we should still try to adapt the fixes for said bugs to current trunk, so the bugs can be fixed there as well.

[cghislai (charlyghislain)]

This is what i get after merging trunk.
I made a test ui you can launch with ./widelands --testui

There are still some layout issues I need to fix.

[cghislai (charlyghislain)]

Concerning the widgets, there are 2 minor issues left : Consecutive line breaks and RTL auto-wrapping.
Other than that, all use new font renderer and (multiline) editboxes work great.
Sirver, I will try to check the changes in your branch.

[SirVer (sirver)]

That's a lot of code. I need to make a chunk of time to review this.

My branch is about removing the legacy richtext renderer and using the new one everywhere (i.e. especially in scenario texts).

[cghislai (charlyghislain)]

I will try to tidy the patch.

As we should first converge the API in graphics/ and text_layout.h, maybe you should have a look there in the first place. From what I see, your text_layout looks more appealing. I think we should merge yours into this one and update text_layout and text_area.

This patch is big, but changes to all ui elements was required. I would also like to unify all signals/getters/setters of basic elements

There are still some important changes that needs to be done here, with respect to the previous comments. That is linking font to locale, (re)introducing bold/italic and serif/condensed styles attributes and removing face attribute.

My branch is about removing the legacy richtext renderer and using the new one everywhere (especially in editboxes), so we should find some common grounds :). In particular, I introduced LayoutInfo to expose text nodes position and updated the rt_renderer to allow keeping extra spaces.

[SirVer (sirver)]

The aim should be to get this (and my branch) merged into trunk ASAP and then branch again to tackle the remaining issues. Smaller branches are much easier to work with anyways.

I try to look into this in more detail on the weekend.

[cghislai (charlyghislain)]

I merged your branch and updated textarea, editbox and multilineeditbox, with various fixes.

[SirVer (sirver)]

I started looking into this now - the testui crashes on game close. and there are a lot of fixmes in the code that I do not understand and that could use a comment. I converted them into NOCOM. I also merged trunk.

I will be on vacation starting tuesday in a week for ~3 weeks. Just fyi :)

[cghislai (charlyghislain)]

Sirver, can you take a look at text_layout.h? I defined it as a read-only interface, along with an implementation that allows adding nodes info. I am not sure how/where to define that implementation. It is only used in the fonthandler(which downcast and reset it) and rt_render.

Also, I removed custom font attributes, and linked font and horizontal align to the locale used. I also set an option to scale fonts to screen resolution.

- Is that font scale option needed? All text areas will have to specify their height in order to get correctly aligned if fonts are not scaled at higher resolution
- Concerning MultilineTextarea, in your branch you expected richtext, while here simple text is allowed and formatted as_ui_font, is that ok?

Happy vacation :)

[GunChleoc (gunchleoc)]

RTL support is coming :)

This means a new dependency though, which is the ICU library. It comes with all kinds of i18n bells and whistles that I will play some more with for Build 20. For now, it would be good if our packaging wizards could double-check that the new library will work for everybody.

I will be gone from my development machine again, so if anybody else would like to play with this branch, be my guest. I especially need help with the text input boxes (editbox, multilineeditbox), which don't work at all at the moment.

Also, text flowing around images is broken (c.f. Campaign dialogs), and for some elements either the text height is reported wrongly or the valign is off - I don't know which yet (You can see this in the full screen menus, e.g. Load Game).

I'm setting this to "resubmit" only to greedily grab everyone's attention. This isn't ready for review by a long shot ;)

review: Needs Resubmitting

[Tino (tino79)]

It does compile and work on win32, small fix only needed atm for a release build:
format.cc, function get_halign() does only contain an assert, a return statement is missing.

[GunChleoc (gunchleoc)]

Thanks, I will look into this when I get back home :)

[kaputtnik (franku)]

Seems to me that this branch is some kind incompatible with trunk... i get 186 conflicts when i try to merge trunk.

So what is the state here? Should we unlink the bugs?

I have removed the links to "fix commited" bugs.

[GunChleoc (gunchleoc)]

To keep merging this branch is very high maintenance, and at this point only I know the code well enough to do it without jumping off a bridge ;)

Let's retarget the bugs.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-31 14:24:59 +0000
+++ CMakeLists.txt	2015-08-01 06:21:02 +0000
@@ -50,6 +50,7 @@
 find_package(SDL2_net REQUIRED)
 find_package(SDL2_ttf REQUIRED)
 find_package(ZLIB REQUIRED)
+find_package(ICU REQUIRED)
 if(OPTION_USE_GLBINDING)
   find_package(glbinding REQUIRED)
 else()

=== modified file 'campaigns/atl01.wmf/scripting/init.lua'
--- campaigns/atl01.wmf/scripting/init.lua	2014-10-03 08:58:44 +0000
+++ campaigns/atl01.wmf/scripting/init.lua	2015-08-01 06:21:02 +0000
@@ -69,9 +69,9 @@
 
 function send_building_lost_message(f)
    send_message(p1, _"Building lost!",
-      rt("image=".. f.immovable.descr.representative_image,
-         p(_"We lost a building to the ocean!")
-      ), { field = f, popup = false }
+      rt(p(img(f.immovable.descr.representative_image) ..
+           _"We lost a building to the ocean!")),
+      { field = f, popup = false }
    )
 end
 

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2015-07-26 10:45:53 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -32,11 +32,11 @@
    title = _"Ensure the supply of building wares",
    number = 6,
    body = objective_text(_"Supply Building Wares", _
-[[Supply basic building material for your economy:]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a quarry]]) ..
-      listitem_bullet(_[[Build two woodcutter’s houses]]) ..
-      listitem_bullet(_[[Build two forester’s houses]]) ..
-      listitem_bullet(_[[Build a sawmill]])
+[[Supply basic building material for your economy:]] ..
+      li(_[[Build a quarry]]) ..
+      li(_[[Build two woodcutter’s houses]]) ..
+      li(_[[Build two forester’s houses]]) ..
+      li(_[[Build a sawmill]])
    ),
 }
 
@@ -45,8 +45,8 @@
    title = _"Expand your territory and explore",
    number = 1,
    body = objective_text(_"Expand and Explore",
-		_([[The island is huge and as long as we are not sure that we are alone here, we cannot relax. Explore and conquer it, this is the only way to protect us from threats on the island and from Atlantis.]]) .. paragraphdivider() ..
-      listitem_bullet(_[[Build military sites to expand your territory]])
+		_([[The island is huge and as long as we are not sure that we are alone here, we cannot relax. Explore and conquer it, this is the only way to protect us from threats on the island and from Atlantis.]]) ..
+      li(_[[Build military sites to expand your territory]])
    ),
 }
 
@@ -55,16 +55,16 @@
    title = _"Establish a solid food production",
    number = 10,
    body = objective_text(_"Food Production",
-		_[[Food is very important for mines and military training areas. Establish a well working food environment by building at least one farm, one blackroot farm and a mill. The two kinds of flour together with water from a well will be baked into bread in a bakery, so build a bakery and a well, too.]] .. paragraphdivider() ..
-      _[[The other two important food wares are smoked fish and smoked meat. Raw meat is delivered from a hunter. A fisher gets the fish out of the sea while a fish breeder makes sure that a school of fish does not go extinct by breeding more. Make sure that there are always fish left, otherwise the fish breeder won’t be able to breed new ones. The smoking happens in a smokery, you will need at least two of those.]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a farm and a blackroot farm]]) ..
-      listitem_bullet(_[[Build a mill to make cornflour and blackroot flour]]) ..
-      listitem_bullet(_[[Build a well]]) ..
-      listitem_bullet(_[[Build a bakery to bake bread from cornflour, blackroot flour and water]]) ..
-      listitem_bullet(_[[Build a hunter’s house to get raw meat]]) ..
-      listitem_bullet(_[[Build a fisher’s house close to water to get raw fish]]) ..
-      listitem_bullet(_[[Build a fish breeder’s house close to the fisher to make sure the fish do not die out]]) ..
-      listitem_bullet(_[[Build two smokeries to smoke raw meat and fish]])
+		_[[Food is very important for mines and military training areas. Establish a well working food environment by building at least one farm, one blackroot farm and a mill. The two kinds of flour together with water from a well will be baked into bread in a bakery, so build a bakery and a well, too.]] ..
+      p(_[[The other two important food wares are smoked fish and smoked meat. Raw meat is delivered from a hunter. A fisher gets the fish out of the sea while a fish breeder makes sure that a school of fish does not go extinct by breeding more. Make sure that there are always fish left, otherwise the fish breeder won’t be able to breed new ones. The smoking happens in a smokery, you will need at least two of those.]]) ..
+      li(_[[Build a farm and a blackroot farm]]) ..
+      li(_[[Build a mill to make cornflour and blackroot flour]]) ..
+      li(_[[Build a well]]) ..
+      li(_[[Build a bakery to bake bread from cornflour, blackroot flour and water]]) ..
+      li(_[[Build a hunter’s house to get raw meat]]) ..
+      li(_[[Build a fisher’s house close to water to get raw fish]]) ..
+      li(_[[Build a fish breeder’s house close to the fisher to make sure the fish do not die out]]) ..
+      li(_[[Build two smokeries to smoke raw meat and fish]])
    )
 }
 
@@ -73,10 +73,10 @@
    title = _"Build a spider farm and a weaving mill",
    number = 3,
    body = objective_text(_"Spidercloth Production",
-		_[[The weavers produce spidercloth and tabards in the weaving mill. Spidercloth is needed for the construction of some buildings and clothing, while tabards are the uniforms of soldiers. The weaving mill needs gold yarn and spideryarn as raw material. Spideryarn is produced by the spider farm, while gold yarn is produced by the gold spinning mill out of gold.]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a weaving mill]]) ..
-      listitem_bullet(_[[Build a spider farm]]) ..
-      listitem_bullet(_[[Build a gold spinning mill]])
+		_[[The weavers produce spidercloth and tabards in the weaving mill. Spidercloth is needed for the construction of some buildings and clothing, while tabards are the uniforms of soldiers. The weaving mill needs gold yarn and spideryarn as raw material. Spideryarn is produced by the spider farm, while gold yarn is produced by the gold spinning mill out of gold.]] ..
+      li(_[[Build a weaving mill]]) ..
+      li(_[[Build a spider farm]]) ..
+      li(_[[Build a gold spinning mill]])
  )
 }
 
@@ -85,12 +85,12 @@
    title = _"Build industry and mines",
    number = 5,
    body = objective_text(_"Industry and Mines",
-		_[[Iron ore, gold ore and coal are mined in the respective mines. The crystal mine will dig for quartz and diamonds – all of them are precious materials and very rarely found. It will produce a lot of stone while searching for them.]] .. paragraphdivider() ..
-      listitem_bullet(_[[The ores have to be smelted at a smelting works before they can be used. The refined materials are then used in the weapon smithy, the armor smithy and the toolsmithy.]]) .. paragraphdivider() ..
-      listitem_bullet(_[[Build a mine of each type. Make sure to send geologists to the mountain first.]]) ..
-      listitem_bullet(_[[Build a smelting works]]) ..
-      listitem_bullet(_[[Build an armor smithy and a weapon smithy]]) ..
-      listitem_bullet(_[[Build a toolsmithy]])
+		_[[Iron ore, gold ore and coal are mined in the respective mines. The crystal mine will dig for quartz and diamonds – all of them are precious materials and very rarely found. It will produce a lot of stone while searching for them.]] ..
+      li(_[[The ores have to be smelted at a smelting works before they can be used. The refined materials are then used in the weapon smithy, the armor smithy and the toolsmithy.]]) ..
+      li(_[[Build a mine of each type. Make sure to send geologists to the mountain first.]]) ..
+      li(_[[Build a smelting works]]) ..
+      li(_[[Build an armor smithy and a weapon smithy]]) ..
+      li(_[[Build a toolsmithy]])
    )
 }
 
@@ -99,8 +99,8 @@
    title = _"Build training sites for soldiers",
    number = 2,
    body = objective_text(_"Soldier Training Sites",
-		_[[Like all other tribes, the Atlanteans are also able to train soldiers: the dungeon trains attack – the major attribute of the Atlanteans – and the labyrinth trains evasion, health and defense. The items produced by the industry are used to train better soldiers in the two training sites.]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a dungeon and a labyrinth]])
+		_[[Like all other tribes, the Atlanteans are also able to train soldiers: the dungeon trains attack – the major attribute of the Atlanteans – and the labyrinth trains evasion, health and defense. The items produced by the industry are used to train better soldiers in the two training sites.]] ..
+      li(_[[Build a dungeon and a labyrinth]])
  )
 }
 
@@ -109,9 +109,9 @@
    title = _"Build a warehouse and a horse farm",
    number = 2,
    body = objective_text(_"Warehouse and Horse Farm",
-		_[[As your road network gets longer and more complicated, you should employ horses to help out your carriers. Horses are bred at horse farms using water and corn. A warehouse will also help to ensure that your transportation system does not collapse.]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a warehouse]]) ..
-      listitem_bullet(_[[Build a horse farm]])
+		_[[As your road network gets longer and more complicated, you should employ horses to help out your carriers. Horses are bred at horse farms using water and corn. A warehouse will also help to ensure that your transportation system does not collapse.]] ..
+      li(_[[Build a warehouse]]) ..
+      li(_[[Build a horse farm]])
   )
 }
 
@@ -120,8 +120,8 @@
    title = _"Build 3 ships to escape from the island",
    number = 1,
    body = objective_text(_"Escape From the Island",
-		_[[There is a lake at the top of the island. Build three ships in these waters and you might be able to rescue your people before the island is swallowed completely by the ocean.]]  .. paragraphdivider() ..
-      listitem_bullet(_[[Build a shipyard close to the lake to start building ships]])
+		_[[There is a lake at the top of the island. Build three ships in these waters and you might be able to rescue your people before the island is swallowed completely by the ocean.]]  ..
+      li(_[[Build a shipyard close to the lake to start building ships]])
    )
 }
 
@@ -133,29 +133,26 @@
 initial_messages = {
 	{
 		title = _"Proud to the Death",
-		body = rt(
+		body =
 			h1(_"Favored by the God") ..
 			p(_([[On the hidden and lost island of Atlantis, a proud tribe settled since the world was very young. Ruled by the bloodline of King Ajanthul – the first human to be empowered by the sea god Lutas to breathe above sea level – and the wise clerics, who provided the link to Lutas – they prospered and became civilized.]])) ..
 			p(_([[This story is taking place during the reign of King Askandor, the 43rd successor of King Ajanthul. He had been a good king, ruling Atlantis with wisdom and foresight. But with age, he became afraid of dying and so he began looking for a cure for death even though most clerics warned him against it. Some said that endless life was only for the gods and that to seek for it was forbidden.]]))
-		)
 	},
 	{
 		title = _"Disgraced Before the God",
-		body = rt(
+		body =
 			h1(_"The God’s Punishment") ..
 			p(_([[But all seemed well. Only the horses seemed to feel something was wrong. During the nights, they went crazy and were full of fear. It was not long before the horse breeder Xydra figured out what was wrong with them: the sea level in front of their stable was rising with ever increasing speed.]])) ..
 			p(_([[The clerics retreated into meditation and the reason for the rising water was soon to be found: the god Lutas had lost faith in the Atlanteans because of the boldness of their king. He decided to withdraw the rights that were granted to King Ajanthul and his children. And so, he called them back below the sea again.]]))
-		)
 	},
 	{
 		title = _"Uproar and Confusion",
-		body = rt(
+		body =
 			h1(_"Emerging Chaos...") ..
 			p(_([[Guilt-ridden, the king committed suicide. Without a monarch, the people turned to the clerics, but they had no substantial help to offer. Most accepted their fate while others tried to change the god’s mind by offering animals in his temple. But to no avail...]])) ..
 			 p(_([[Jundlina, the late king’s daughter and the highest priestess of the god was the most determined cleric. As countless offerings didn’t change the situation, she convinced herself that to soothe the god, an offer of great personal value was needed. So she offered him her most beloved: her husband, the father of her only child.]])) ..
 			 p(_([[But not even this changed the mind of the god. The water kept on rising. Nearly driven insane by guilt, pain and anger, Jundlina became a heretic: Secretly, she gathered people of the common folk who were not in line with the decision of the clerics to accept the god’s will. Together with them, she set the temple on fire and stole a ship to flee from the god’s influence over Atlantis. This small group started praying to Satul, the fire god and the worst enemy of Lutas.]])) ..
 			 p(_([[Leaving the dying Atlantis and their past behind, they started on a quest to find a place sheltered by the fire and protected from the sea.]]))
-		)
 	},
 } -- end of initial messages.
 
@@ -164,9 +161,9 @@
 		title = _"The Princess’ Memoir",
 		body = jundlina(_"Jundlina Writes Down Her Memories",
 			_([[We left Atlantis and sailed east. We entered the forbidden sea on the sixth day without noticing any pursuers from Atlantis and without Lutas having smashed our ship. Now, we are out of his reach. One day later, we sighted an island which seems to have one of these fire spitting mountains on it. I deemed this a sign from the fire god and we landed on its shore.]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[We spent the last week building two watchtowers on the mountains close to our landing area; and, of course, a hall for us all. We have very talented constructors in our group – still, the buildings do not match the art we had on Atlantis. I hope they will withstand the next rain. At least, the towers will warn us if a ship from Atlantis follows us and if the island is inhabited, we will see attackers a long time before they arrive.]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[We have established ourselves on this island. The next step is now to make it a home. I reckon we need to establish a sustainable economy and to explore our surroundings. I called for specialists and will follow their advice.]]))
 	},
 	{
@@ -208,9 +205,9 @@
 		title = _"Colionder is in Thought",
 		body = colionder(
 			_([[Ahh, but I think this is impossible to change. The preparing and eating of food is something deeply ingrained in us Atlanteans – it is a ceremony that we just need for our well-being. So I guess we cannot take this away from the individuals completely.]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[But we might find a compromise in between: for me, making bread is a troublesome task. Grinding the blackroot and corn to flour and then baking the bread is tedious and boring; I feel a more industrial approach would be helpful here. I for one would love to just have fresh bread delivered to my house every day.]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[Oooh and even more important: the smoking of fish and meat to cleanse them and improve their taste is terrible. My house is full of smoke and stinks for weeks afterwards. Don’t you think that this could be done in a special building where the side effects do not matter? I think those two things would be accepted by the people and would reduce the cooking time without taking away the ritual.]]))
 	},
 	{
@@ -234,7 +231,7 @@
 		title = _"A Man Comes to Jundlina",
 		body = opol(
 			_([[May Satul warm you, Jundlina. My name is Opol, and I am the highest weaver of the guild abandoning Atlantis and Lutas with you. I come with sad news indeed: we have no more spidercloth. Not a single piece is to be found in our warehouses. Could you not help the weavers’ guild by arranging the building of a weaving mill and a spider farm? The spiders deliver the finest silk and we will produce the finest spidercloth from it.]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[We offer to also produce the tabards for young soldiers and the golden tabards for officers for you in exchange. You will need them for sure as soon as you want to recruit new soldiers.]]))
 	},
 	{
@@ -305,7 +302,7 @@
       title = _"Jundlina Considers the Economy",
       body = jundlina(_"Jundlina",
 			_([[People are complaining about crowded streets and slow transportation. We need to help out our carriers on the roads. I have decided to build a horse farm so that the horses can help with the heavy wares.]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[Another way to take load from our roads is to build warehouses. We have claimed the mountain now, it seems a good idea to have a warehouse on the plateau to avoid having to transport everything up and down the slopes.]]))
 			.. new_objectives(obj_horsefarm_and_warehouse)
    }
@@ -321,9 +318,9 @@
 		title = _"A Dangerous Discovery",
 		body = jundlina(_"Jundlina is in Thought",
 			_([[We found an old building, destroyed and burned by flames. I am very worried about this discovery. The building is not of any kind I’ve ever seen. It is certainly not designed by any Atlantean architect I’ve ever heard about. The building is crude, the assemblage is sloppy. But the materials are very enduring: the wood used for it seemed to have been burned in a strange way before it was used as building material – it is hard as stone.]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[The implications frighten me. Are there others on this island? Where are they then? They work with fire, are they praying to Satul too? Are they friends or foe? And why is the building burned down? Has this island seen war? Is a war being waged on it right now?]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[We must improve our military capabilities. If there are foes on the island, we have to be prepared when we meet them. We should also enforce the fortification of our borders.]]))
 	}
 }
@@ -386,7 +383,7 @@
 		title = _"Jundlina Replies",
 		body = jundlina(_"Jundlina",
 			_([[Your red hair is a signal from the fire god. I will trust you and support your plan. Our survival lies in your hands now, Ostur.]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[Swift now, we need a house for Ostur next to the lake, and we need planks, logs and spidercloth for the construction there. Forget about everything else, we need those wares on top of the mountain before our warehouses are all swallowed by the sea.]]))
 			.. new_objectives(obj_build_ships)
 	}
@@ -397,9 +394,9 @@
       title = _"Jundlina is Relieved",
       body = jundlina(_"Jundlina",
 			_([[Praise Satul! Ostur, the young ship builder did it. We have three ships – never have I seen sturdier ones – with enough room to carry all of us and some wares too. And this rescue came just in time: Lutas is about to swallow the rest of this island, the water rises faster by the hour. But we can make our escape now and start over in some country farther away...]])
-			.. paragraphdivider() ..
+			.. close_p() .. open_p() ..
 			_([[I expect a long journey, but we will find the land of Satul in the end. This is what I promised my people. And myself.]]))
-			.. rt("<p font-size=10> <br></p>" .. h1(_ "Congratulations") ..
-			p(_[[You have won this mission. Continue with the next one or keep playing for as long as you like.]]))
+			.. objective_text(_ "Congratulations",
+				_[[You have won this mission. Continue with the next one or keep playing for as long as you like.]])
    }
 }

=== modified file 'campaigns/bar01.wmf/scripting/texts.lua'
--- campaigns/bar01.wmf/scripting/texts.lua	2015-07-26 11:05:38 +0000
+++ campaigns/bar01.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -23,9 +23,8 @@
    title = _"Build two ranger’s huts",
    number = 1,
    body = objective_text(_"Build two ranger’s huts",
-      listitem_bullet(_"Build a ranger’s hut next to each lumberjack’s hut.") ..
-      listitem_arrow(_"Naturally, trees only grow at a slow rate. To make sure you have enough logs, you have to build rangers.")
-   )
+      li(_"Build a ranger’s hut next to each lumberjack’s hut.") ..
+      li_arrow(_"Naturally, trees only grow at a slow rate. To make sure you have enough logs, you have to build rangers."))
 }
 
 obj_claim_northeastern_rocks = {
@@ -33,8 +32,8 @@
    title = _"Expand north-east and build a quarry",
    number = 1,
    body = objective_text(_"Expand north-east to the rocks",
-      listitem_bullet(_"Build military buildings (like sentries or barriers) to expand your territory.") ..
-      listitem_bullet(_"Get to the rocks north-east from you and build a quarry there."))
+      li(_"Build military buildings (like sentries or barriers) to expand your territory.") ..
+      li(_"Get to the rocks north-east from you and build a quarry there."))
 }
 
 obj_build_mines = {
@@ -42,21 +41,19 @@
    title = _"Start building mines on the mountain",
    number = 2,
    body = objective_text(_"Build coal and iron ore mines",
-      listitem_bullet(_"Build a coal mine and an iron ore mine.") ..
-      listitem_arrow(_"To do so, place a flag up on the mountain’s flank to the east (on mountain terrain though, not mountain meadow). When you click on the new flag, you can send geologists there. Because the flag is on a mountain, the geologists will search for ores; otherwise, they would search for water. Then build a mine for both kinds of resources that he will find, choosing the appropriate mine to be built:") ..
-		"</rt>" ..
-		rt("image=tribes/barbarians/resi_coal1/resi_00.png", p(_"a bit of coal")) ..
-		rt("image=tribes/barbarians/resi_coal2/resi_00.png", p(_"a lot of coal")) ..
-		rt("image=tribes/barbarians/resi_iron1/resi_00.png", p(_"a bit of iron")) ..
-		rt("image=tribes/barbarians/resi_iron2/resi_00.png", p(_"a lot of iron")) ..
-		rt("image=tribes/barbarians/resi_gold1/resi_00.png", p(_"a bit of gold")) ..
-		rt("image=tribes/barbarians/resi_gold2/resi_00.png", p(_"a lot of gold")) ..
-		rt("image=tribes/barbarians/resi_granite1/resi_00.png", p(_"a bit of granite")) ..
-		rt("image=tribes/barbarians/resi_granite2/resi_00.png", p(_"a lot of granite")) ..
-		rt("image=tribes/barbarians/resi_water1/resi_00.png", p(_"water")) ..
-		rt("image=tribes/barbarians/resi_none/resi_00.png", p(_"nothing was found here")) ..
-		"<rt>" ..
-			p(_[[Mines can only be built on mountain terrain. Suitable places for mines are displayed as orange mine symbols.]]))
+      li(_"Build a coal mine and an iron ore mine.") ..
+      li_arrow(_"To do so, place a flag up on the mountain’s flank to the east (on mountain terrain though, not mountain meadow). When you click on the new flag, you can send geologists there. Because the flag is on a mountain, the geologists will search for ores; otherwise, they would search for water. Then build a mine for both kinds of resources that he will find, choosing the appropriate mine to be built:") ..
+		p(img("tribes/barbarians/resi_coal1/resi_00.png") .. _"a bit of coal") ..
+		p(img("tribes/barbarians/resi_coal2/resi_00.png") .. _"a lot of coal") ..
+		p(img("tribes/barbarians/resi_iron1/resi_00.png") .. _"a bit of iron") ..
+		p(img("tribes/barbarians/resi_iron2/resi_00.png") .. _"a lot of iron") ..
+		p(img("tribes/barbarians/resi_gold1/resi_00.png") .. _"a bit of gold") ..
+		p(img("tribes/barbarians/resi_gold2/resi_00.png") .. _"a lot of gold") ..
+		p(img("tribes/barbarians/resi_granite1/resi_00.png") .. _"a bit of granite") ..
+		p(img("tribes/barbarians/resi_granite2/resi_00.png") .. _"a lot of granite") ..
+		p(img("tribes/barbarians/resi_water1/resi_00.png") .. _"water") ..
+		p(img("tribes/barbarians/resi_none/resi_00.png") .. _"nothing was found here") ..
+		p(_[[Mines can only be built on mountain terrain. Suitable places for mines are displayed as orange mine symbols.]]))
 }
 
 obj_basic_food = {
@@ -64,9 +61,9 @@
    title = _"Provide your miners with food",
    number = 3,
    body = objective_text(_"Build a hunter, a gamekeeper and a tavern",
-      listitem_bullet(_"In order to work, your miners need food.") ..
-      listitem_arrow(_"A hunter can hunt down animals, while a gamekeeper prevents them from becoming extinct. The meat is then processed in a tavern into lunches for your miners.") .. " " ..
-      _([[This is only the first example of a ware which has to be refined before being used in a secondary building – others will follow.]]))
+      li(_"In order to work, your miners need food.") ..
+      li_arrow(_"A hunter can hunt down animals, while a gamekeeper prevents them from becoming extinct. The meat is then processed in a tavern into lunches for your miners.") ..
+      p(_([[This is only the first example of a ware which has to be refined before being used in a secondary building – others will follow.]])))
 }
 
 obj_begin_farming = {
@@ -90,11 +87,11 @@
    title = _"Enhance buildings and build a micro brewery",
    number = 3,
    body = objective_text(_[[Enhance a mine and the tavern, and build a micro brewery.]],
-      listitem_bullet(_"Enhance the coal mine or the iron mine to a deep mine, and enhance the tavern to an inn.") ..
-      listitem_bullet(_"Also build a micro brewery.") ..
-      listitem_arrow(_"A normal mine can only dig up about one third of all the resources that lie beneath it; then it must be enhanced to a deep mine in order to keep it working properly. To enhance a building, choose it and then click the appropriate button in the appearing window.")  ..
-      listitem_arrow(_"Workers gain experience by successful work. With enough experience, they become more advanced workers, who are necessary to operate the enhanced buildings. Do not enhance a building before you have enough advanced workers to operate the advanced building!") ..
-      listitem_arrow(_"Such buildings usually have greater demands than the basic kind of that building – for instance, deep mines need snacks instead of rations. You will have to enhance your tavern to an inn in order to produce snacks out of pitta bread AND a second kind of food (meat or fish) AND beer.") ..
+      li(_"Enhance the coal mine or the iron mine to a deep mine, and enhance the tavern to an inn.") ..
+      li(_"Also build a micro brewery.") ..
+      li_arrow(_"A normal mine can only dig up about one third of all the resources that lie beneath it; then it must be enhanced to a deep mine in order to keep it working properly. To enhance a building, choose it and then click the appropriate button in the appearing window.")  ..
+      li_arrow(_"Workers gain experience by successful work. With enough experience, they become more advanced workers, who are necessary to operate the enhanced buildings. Do not enhance a building before you have enough advanced workers to operate the advanced building!") ..
+      li_arrow(_"Such buildings usually have greater demands than the basic kind of that building – for instance, deep mines need snacks instead of rations. You will have to enhance your tavern to an inn in order to produce snacks out of pitta bread AND a second kind of food (meat or fish) AND beer.") ..
       _"You may of course enhance all mines to deep mines instantly given you have the workers – bigger mines work a bit faster, smaller mines need cheaper food. It’s up to you which strategy you prefer.")
 }
 
@@ -103,26 +100,21 @@
    title = _"Build a wood hardener",
    number = 1,
    body = objective_text(_"Build a wood hardener",
-      _([[Bigger and better buildings – including all military ones – require better building materials. They cannot be built out of simple logs – the wood has to be refined to blackwood by a wood hardener first. Always remember to build a wood hardener before you run out of blackwood, as without it you cannot expand.]])
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a wood hardener"))
+      _([[Bigger and better buildings – including all military ones – require better building materials. They cannot be built out of simple logs – the wood has to be refined to blackwood by a wood hardener first. Always remember to build a wood hardener before you run out of blackwood, as without it you cannot expand.]]) ..
+      li(_"Build a wood hardener"))
 }
 
 obj_better_material_2 = {
    name = "mission grout",
    title = _"Build a lime kiln and coal economy",
    number = 3,
-   body = objective_text(_"Build a lime kiln fed by a well, and by a charcoal kiln or by a coal mine",
-      _([[Better buildings may also require other improved materials besides blackwood. One of these is grout, which is produced out of raw stone, water and coal by a lime-burner.]])
-      .. paragraphdivider() ..
-      _([[You can obtain water by building a well upon a water source, which your geologists can discover when you send them to any flag that is not on a mountain.]])
-      ..paragraphdivider() ..
-      "</p></rt>" ..
-      rt("image=pics/menu_geologist.png", p(_"In order to call a geologist to search for water, click on a flag in the area that you want him to search and then on the button labeled ‘Send geologist to explore site’.")
-      .. paragraphdivider() ..
-      _([[Coal can be obtained by building a charcoal kiln or a coal mine. Burning charcoal out of logs is slow. You should only build a charcoal kiln when no coal is available.]])
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a lime kiln and a well. Additionally, build either a charcoal kiln or a coal mine for coal supply.")))
+   body =
+		objective_text(_"Build a lime kiln fed by a well, and by a charcoal kiln or by a coal mine",
+		_([[Better buildings may also require other improved materials besides blackwood. One of these is grout, which is produced out of raw stone, water and coal by a lime-burner.]]) ..
+      p(_([[You can obtain water by building a well upon a water source, which your geologists can discover when you send them to any flag that is not on a mountain.]])) ..
+      p(img("pics/menu_geologist.png") .. _"In order to call a geologist to search for water, click on a flag in the area that you want him to search and then on the button labeled ‘Send geologist to explore site’.") ..
+      p(_([[Coal can be obtained by building a charcoal kiln or a coal mine. Burning charcoal out of logs is slow. You should only build a charcoal kiln when no coal is available.]])) ..
+      li(_"Build a lime kiln and a well. Additionally, build either a charcoal kiln or a coal mine for coal supply."))
 }
 
 obj_better_material_3 = {
@@ -130,9 +122,8 @@
    title = _"Build a reed yard",
    number = 1,
    body = objective_text(_"Build a reed yard",
-      _([[The third material necessary for improved buildings is thatch reed, used to cover roofs. Thatch reed is planted by a gardener around his building, the reed yard.]])
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a reed yard"))
+      _([[The third material necessary for improved buildings is thatch reed, used to cover roofs. Thatch reed is planted by a gardener around his building, the reed yard.]]) ..
+      li(_"Build a reed yard"))
 }
 
 obj_build_cattlefarm = {
@@ -140,11 +131,9 @@
    title = _"Build a cattle farm",
    number = 1,
    body = objective_text(_"Build a cattle farm",
-      _([[When roads are under heavy load for a long time, one carrier is usually not enough to transport goods swiftly. Traffic jams are the consequence. Such roads therefore employ a second carrier: an ox that helps to carry the wares. This doubles the transport capacity.]])
-      .. paragraphdivider() ..
-      _([[Oxen are bred in cattle farms out of wheat and water.]])
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a cattle farm"))
+      _([[When roads are under heavy load for a long time, one carrier is usually not enough to transport goods swiftly. Traffic jams are the consequence. Such roads therefore employ a second carrier: an ox that helps to carry the wares. This doubles the transport capacity.]]) ..
+      p(_([[Oxen are bred in cattle farms out of wheat and water.]])) ..
+      li(_"Build a cattle farm"))
 }
 
 
@@ -156,7 +145,7 @@
    title = _"The Story Begins",
    body = thron(_"Thron sighs…",
       _[[It’s been months, and we are still hiding where the forests are old and dark.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[My warriors hunt at day and lie awake at night – listening to the sounds of the cruel slaughter echoing from afar amongst the ancient trees.]]
    )
 }
@@ -166,7 +155,7 @@
    title = _"The Story Begins",
    body = thron(
       _[[We can see the raging flames that swallow Al’thunran from here, miles away.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[The red lights flash in the darkness and dance to the rhythm of the war drums that haunt me even in my nightmares.]]),
    field = al_thunran,
    position = "topleft",
@@ -178,7 +167,7 @@
    title = _"The Story Begins",
    body = thron(
       _[[My father’s bones rest peacefully in the ground on which he once ended the senseless spilling of blood that had arisen amongst us. It pains me that his peace only endured for one generation.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[Boldreth, my loyal companion and friend is a source of peace and comfort to me in these dark times. He keeps my spirits high and those of my warriors awake, preventing greed or despair from destroying the bonds between us as well.]]),
    field = grave,
    position = "topleft"
@@ -196,7 +185,7 @@
    title = _"The Story Begins",
    body = thron(_"Thron is shaking his head…",
       _([[Yet the war goes on. More and more of our brothers and sisters flee the brutal war raging in the capital beneath the trees.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[The stories they tell about the deeds of our kin are sad to hear. I’ve spent nights lying awake, restless, more tired than I ever believed one could be. Yet whenever I close my eyes, I see the fortress my father built consumed by flames. The Throne Among the Trees, the symbol of unity and peace among our kin, became the wedge that drives us apart.]])),
    field = sf -- scroll back when showing this and the next few message boxes
 }
@@ -206,7 +195,7 @@
    title = _"The Story Begins",
    body = thron(
       _([[Today my hunters brought men, women and little children before me who had hidden out in the forests, trying to escape the war, hate and revenge that rage among the tribes fighting each other like in olden times, when we were no more but wild beasts driven and controlled by instincts. None of my brothers will ever gain and hold control over the wooden throne, none of the tribes will be strong enough to subdue the other. There will be no end to this slaughter, unless… is this it? As father told me?]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[To rise against whoever threatens our very existence, even though it may be one of your own blood or mind?]]))
 }
 
@@ -215,7 +204,7 @@
    title = _"The Story Begins",
    body = thron(
       _([[Boldreth seems more and more torn as the days go by. The spirits of my fellows sink as the cold season approaches, and we are still living in no more than huts and barracks. I never intended to stay out here in the wilderness for so long – but I never thought my brothers would engage in this senseless battle for so long either.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[Perhaps it’s time to make ourselves feel a little more at ease here. Perhaps it’s time to give those who still live and think united a new home, replacing what is now lost to us? Until we can return to the place we once called our home…]]))
 }
 
@@ -224,7 +213,7 @@
    title = _"Somebody Comes up to You",
    body = khantrukh(_"An old man says…",
       _[[Hail, chieftain. I am Khantrukh and have seen many winters pass. Please allow me to aid you with my counsel through these darkened days.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[Only the gods know for how long we have to remain hidden here. The warriors hope we may march back gloriously any day now, but I strongly doubt that will happen soon. And the days are short and cold…]])
 }
 
@@ -233,9 +222,9 @@
    title = _"The Advisor",
    body = khantrukh(_"Khantrukh notes…",
       _[[I see you have already built a quarry and two lumberjack’s huts. That is a good beginning if we want to stay here longer.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[But never forget – these forests are our heritage, entrusted upon us by our ancestors. We must always respect and care for them. What we take, we must give back again.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[So, in order to replace the trees we chop down, we should build some ranger’s huts, preferably close to the lumberjack’s huts.]])
       .. new_objectives(obj_build_rangers)
 }
@@ -245,7 +234,7 @@
    title = _"In the Night",
    body = thron(_"Thron says…",
       _[[During another sleepless night, I went up to the hill and gazed towards the north. The fires are still burning, satisfying their hunger upon my father’s legacy.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[They are a constant reminder of why we have to hide here… and why we must return in the end!]]),
    field = al_thunran,
    position = "topleft",
@@ -257,7 +246,7 @@
    title = _"At the Tomb",
    body = thron(_"Thron says…",
       _[[Once again, I went up to my father’s tomb, in a sacred grove at the foot of the great spire of Kal’mavrath. I just stood there and felt neither the hours pass nor the cold rain pouring down from the darkened sky…]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[Somehow, it felt like a farewell. For the first time, I wondered what the future might hold for me…]]),
    field = grave,
    position = "topleft",
@@ -269,7 +258,7 @@
   title = _"The Other Day",
   body = thron(_"Thron says thoughtfully…",
       _[[Some time ago, Boldreth came to me. His advice was to move to a place closer to home – to strike at the first sign of my brothers’ forces wavering.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[But when I look over the forests I can still see black smoke rising to the sky. I know – it is too early yet, and what he hopes for will not happen any time soon. He might still be right, but I fear the bloodshed that returning too fast would cause on both sides…]])
 }
 
@@ -278,7 +267,7 @@
    title = _"The Oath",
    body = thron(_"Thron looks furious…",
       _[[Today, my warriors picked up an old man, wandering sick and wounded through the dark forest. We listened in horror as he told us of the atrocities taking place in Al’thunran.]]
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _[[I hereby renew my oath – I will stop this madness at any cost!]])
 }
 
@@ -321,7 +310,7 @@
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth exclaims…",
       _([[Just look at that! In the east is the great mountain of Kal’mavrath! I wonder what treasures nature might have hidden beneath its majestic flanks!]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[Let’s expand to the east. There’s a chance for the elderly to become useful once in a while! Let us send out some of those who understand the stone’s tongue to unravel the mountain’s secrets!]]))
       .. new_objectives(obj_build_mines)
 }
@@ -330,7 +319,7 @@
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth laughs…",
       _([[By Chat’Karuth’s beard, this is amazing! Just imagine what we can use this coal and iron ore for!]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[It might even be enough to…]]))
 }
 
@@ -345,7 +334,7 @@
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth nods…",
       _([[I have to hand it to you: you are right here, old man.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[There seem to be quite a lot of animals in the forests here – we might just hunt down more of them. And, of course, the people would cheer a new tavern – hey, we might call it ‘Thron’s Pride’ or so if you want!]]))
       .. new_objectives(obj_basic_food)
 }
@@ -354,7 +343,7 @@
    title = _"The Advisor",
    body = khantrukh(_"The elder jumps into the air…",
       _([[Wisdom commands to seek variety.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[North of the great mountain is a large plain – why don’t we use the space Mother Nature gave us and build a farm? I sure would enjoy a freshly baked pitta bread for a change…]]))
       .. new_objectives(obj_begin_farming)
 }
@@ -363,7 +352,7 @@
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth cheers up…",
       _([[Our hunters are out in the forests, Thron.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[I promise you, before the sun sets today you will have a magnificent meal fit for the chieftain of all clans!]]))
 }
 
@@ -377,7 +366,7 @@
    title = _"A Beautiful Morning",
    body = thron(_"Thron recognizes…",
       _([[A tavern opened for our people yesterday. While I am hardly in the mood for celebration, I noticed how much this tiny bit of home means to my people. Their songs filled the air until deep in the night, and they were in higher spirits still the day after.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[Maybe we actually are slowly creating a place here which we can… call home.]]))
 }
 
@@ -392,7 +381,7 @@
    title = _"The Advisor",
    body = khantrukh(_"Khantrukh speaks…",
       _([[Our miners are digging up less and less by the day! We have to go deeper, closer to the mountain’s core, if we want more of its treasures!]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[Of course, it is dark and cold in such depths and only a few venture voluntarily into these places. We should reward this bravery with greater rations for them. And a pint of beer or two will keep their spirits high.]]))
       .. new_objectives(obj_enhance_buildings)
 }
@@ -401,7 +390,7 @@
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth seems concerned…",
       _([[As I just discovered, we are running short on blackwood! We cannot put our warriors into some crumbling huts, and even less so in times as dangerous as ours!]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[We need a wood hardener, and we need one now!]]))
       .. new_objectives(obj_better_material_1)
 }
@@ -410,7 +399,7 @@
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth smiles…",
       _([[Well, old friend, this should ensure that our fortifications do not break down with our foes’ first battle cry! Now we can expand safely!]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[Still, it would not hurt to accumulate some grout for our further campaign; thus we could, in times of need, build a fortress such as the world has never seen before!]]))
       .. new_objectives(obj_better_material_2)
 }
@@ -419,7 +408,7 @@
    title = _"The Advisor",
    body = khantrukh(_"Khantrukh steps in…",
       _([[Chieftain, this is a disgrace! It is well that we can produce grout for mighty fortifications and great buildings now – only this does not prevent our roofs from becoming leaky! Maybe the young ones like spending their nights in the rain, but I just can’t find any sleep with these raindrops dripping on my face!]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[Now this is a problem we should do something about!]]))
       .. new_objectives(obj_better_material_3)
 }
@@ -434,7 +423,7 @@
    title = _"We Need Oxen!",
    body = khantrukh(_"Khantrukh speaks…",
       _([[As our realm is getting bigger and bigger, the traffic on the roads is overwhelming. Our poor carriers are no longer able to transport the goods as fast as we need them to. I suggest we give them some support by breeding oxen.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[They are amazing animals: The ox is as swift as a human being while being much stronger and very frugal: all we need is wheat and water to breed them and they will do their work on the roads loyally and reliably.]]))
       .. new_objectives(obj_build_cattlefarm)
 }
@@ -443,9 +432,9 @@
    title = _"Mission Complete",
    body = thron(_"Thron speaks…",
       _([[The other day Boldreth asked me to accompany him to the new inn. It would cheer me up, he said.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[When I looked around, I saw faithful faces, trusting that I could guide them through these dark days. Yet before I could speak any words of gratitude or encouragement, one of my warriors ran into the inn. He had been far out in the forest for the past days and I could see how weary he was.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[The news he brought changed everything…]]))
       .. objective_text(_"Victory",
 			_[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]])
@@ -455,7 +444,7 @@
    title = _"One Full Moon Night",
    body = thron(_"Thron speaks…",
       _([[One night, when the moon shone brightly, I climbed to the peak of Kal’mavrath.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[When I gazed at the horizon, I still saw crimson lights flicker in the distance. It is incredible with how much passion my brethren fight this war. I fear the moment I will see Al’thunran again – will there be anything but ashes and wasted ruins left of our once beautiful capital when we get there?]]))
 }
 
@@ -463,9 +452,9 @@
     title = _"Another Cold Day",
     body = thron(_"Thron looks worried…",
       _([[The winter is upon us. Many of us are suffering from the cold, yet we must endure. The day we may return cannot be far anymore – it must not be far anymore.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[I prayed that it might get warmer again, as I prayed that the war would finally come to an end.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[So far, it seems that neither prayer was fulfilled.]]))
 }
 
@@ -473,9 +462,9 @@
    title = _"A friendly village has joined us!",
    body = thron(_"Thron speaks…",
       _([[We have found a village with friendly and productive people, impressed by our wealth, technology and strength.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[They have lived simply, yet blithely, from hunting and farming. They have not been involved in any conflict so far, and are not ready for fighting.]])
-      .. paragraphdivider() ..
+      .. close_p() .. open_p() ..
       _([[But they fear that the war around Al’thunran will set an end to this life. Therefore, they have decided to join us, hoping that we can help each other.]])
    )
 }

=== modified file 'campaigns/bar02.wmf/scripting/texts.lua'
--- campaigns/bar02.wmf/scripting/texts.lua	2014-10-30 11:37:38 +0000
+++ campaigns/bar02.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -21,13 +21,12 @@
    title = _"Build up a small food economy",
    number = 5,
    body = objective_text(_"Build up a small food economy",
-      _"Build up a basic food economy to provide your people with food."
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a fisher’s hut") ..
-      listitem_bullet(_"Build a hunter’s hut") ..
-      listitem_bullet(_"Build a well") ..
-      listitem_bullet(_"Build a farm") ..
-      listitem_bullet(_"Build a bakery"))
+      _"Build up a basic food economy to provide your people with food." ..
+      li(_"Build a fisher’s hut") ..
+      li(_"Build a hunter’s hut") ..
+      li(_"Build a well") ..
+      li(_"Build a farm") ..
+      li(_"Build a bakery"))
 }
 
 obj_build_cattlefarm = {
@@ -35,9 +34,8 @@
    title = _"Build a cattle farm",
    number = 1,
    body = objective_text(_"Remember to build a cattle farm",
-      _"As your roads grow longer and your economy bigger, you should make good use of your oxen to help transport wares more quickly."
-      .. paragraphdivider () ..
-      listitem_bullet(_"Remember to build a cattle farm")
+      _"As your roads grow longer and your economy bigger, you should make good use of your oxen to help transport wares more quickly." ..
+      li(_"Remember to build a cattle farm")
    ),
 }
 
@@ -46,7 +44,7 @@
    title = _"Build a donjon",
    number = 1,
    body = objective_text(_"Build a donjon",
-      listitem_bullet(_"Build a donjon at the north-east border of your territory to get greater visual range and to protect your people from sudden attacks by enemies."))
+      li(_"Build a donjon at the north-east border of your territory to get greater visual range and to protect your people from sudden attacks by enemies."))
 }
 
 obj_explore_further = {
@@ -54,7 +52,7 @@
    title = _"Explore further",
    number = 1,
    body = objective_text(_"Explore further",
-      listitem_bullet(_"Build more military buildings to explore the area around the headquarters and to ensure the safety of your people."))
+      li(_"Build more military buildings to explore the area around the headquarters and to ensure the safety of your people."))
 }
 
 obj_build_mining_economy = {
@@ -62,7 +60,7 @@
    title = _"Build a mining infrastructure",
    number = 6,
    body = objective_text(_"Build a mining infrastructure",
-      listitem_bullet(_"Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metal workshop."))
+      li(_"Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metal workshop."))
 }
 
 obj_build_a_fortress = {
@@ -70,7 +68,7 @@
    title = _"Build a fortress",
    number = 1,
    body = objective_text(_"Build a fortress",
-      listitem_bullet(_"Build a fortress to the east of the mountains."))
+      li(_"Build a fortress to the east of the mountains."))
 }
 
 obj_build_training_infrastructure = {
@@ -78,9 +76,9 @@
    title = _"Build a training infrastructure",
    number = 4,
    body = objective_text(_"Build a training infrastructure",
-      listitem_bullet(_"Build a battle arena and a training camp to the west of the mountains.") ..
-      listitem_bullet(_"Enhance your metal workshop to an axfactory in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the axfactory to a war mill, which will produce additional weapons.") ..
-      listitem_bullet(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
+      li(_"Build a battle arena and a training camp to the west of the mountains.") ..
+      li(_"Enhance your metal workshop to an axfactory in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the axfactory to a war mill, which will produce additional weapons.") ..
+      li(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
 }
 
 
@@ -89,8 +87,8 @@
    title = _"Build a warehouse",
    number = 1,
    body = objective_text(_"Build a warehouse",
-      listitem_bullet(_"Build a warehouse to the west of the mountains.") ..
-      listitem_arrow(_"Warehouses are similar to your headquarters, with the only difference that they aren’t defended by soldiers. It is often wise to build a warehouse when your territory is growing and the paths to your headquarters get longer and longer."))
+      li(_"Build a warehouse to the west of the mountains.") ..
+      li_arrow(_"Warehouses are similar to your headquarters, with the only difference that they aren’t defended by soldiers. It is often wise to build a warehouse when your territory is growing and the paths to your headquarters get longer and longer."))
 }
 
 obj_build_trainingssites = {
@@ -98,10 +96,9 @@
    title = _"Build training sites",
    number = 2,
    body = objective_text(_"Build training sites",
-      listitem_bullet(_"Build a battle arena and a training camp to the west of the mountains.") ..
-      listitem_arrow(_"Training sites like a training camp or a battle arena are used for training soldiers in their different attributes. These attributes are important in fights and the better a soldier is, the higher is the chance to win a fight."
-      .. "<br>" ..
-		_"The attributes are: health, attack, defense and evade."))
+      li(_"Build a battle arena and a training camp to the west of the mountains.") ..
+      li_arrow(_"Training sites like a training camp or a battle arena are used for training soldiers in their different attributes. These attributes are important in fights and the better a soldier is, the higher is the chance to win a fight." ..
+			p(_"The attributes are: health, attack, defense and evade.")))
 }
 
 obj_build_weapon_productions = {
@@ -109,7 +106,7 @@
    title = _"Build weapons production",
    number = 3,
    body = objective_text(_"Build weapons production",
-      listitem_bullet(_"Enhance your metal workshop to an axfactory in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the axfactory to a war mill, which will produce additional weapons."))
+      li(_"Enhance your metal workshop to an axfactory in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the axfactory to a war mill, which will produce additional weapons."))
 }
 
 obj_build_a_helmsmithy = {
@@ -117,7 +114,7 @@
    title=_"Build a helm smithy",
    number = 1,
    body = objective_text(_"Build a helm smithy",
-      listitem_bullet(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
+      li(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
 }
 
 obj_destroy_kalitaths_army = {
@@ -125,8 +122,8 @@
    title = _"Destroy Kalitath’s army",
    number = 2,
    body = objective_text(_"Destroy Kalitath’s army",
-      listitem_bullet(_"Destroy Kalitath’s army and expand your territory to the east.") ..
-      listitem_arrow(_"To attack an enemy, you must click on the door of an adversary’s military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross (‘Start Attack’)."))
+      li(_"Destroy Kalitath’s army and expand your territory to the east.") ..
+      li_arrow(_"To attack an enemy, you must click on the door of an adversary’s military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross (‘Start Attack’)."))
 }
 
 obj_military_assault_on_althunran = {
@@ -134,7 +131,7 @@
    title = _"Military assault on Al’thunran",
    number = 1,
    body = objective_text(_"Military assault on Al’thunran",
-      listitem_bullet(_"Destroy all forces of Thron’s two brothers to liberate the throne-circle."))
+      li(_"Destroy all forces of Thron’s two brothers to liberate the throne-circle."))
 }
 
 -- =======================================================================
@@ -145,7 +142,7 @@
    title=_"Close to Home",
    body =thron(_"Thron looks worried…",
 		_([[These last days, we came closer to our capital. Many people have already joined us on our march and set their hopes on me. However, I fear that we are not strong enough to take up the battle against my brothers.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[For now, we are resting at the borders of the old forest and preparing for the coming days.]]))
 }
 
@@ -198,9 +195,9 @@
    title = _"Renegade Fortification",
    body = thron(_"Thron says:",
 		_([[The traitor left his armies dying where they lay when he saw that he would not keep my forces back. Kalitath disappeared in the confusion of the war, but I don’t care now. Shall he flee and be forgotten for all times as a tribal leader that would not bow before the wooden throne, that is mine to take now.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Furthermore, his flight brought us a great benefit: all year, Kalitath was so busy fighting that he did not even care to store enough food for all his men. Now that he has fled, their hunger has caused some of his younger followers to desert. This group holds a strong fortification on the main ring.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[But there is more news: My scouts have reported that the two raging tribes of my brothers are in chaos and have barely noticed the new danger that is about to strike them. However, they would not care if they noticed I guess, blinded by rage and hate, there is no sense left in them at all I believe.]]))
 }
 
@@ -239,7 +236,7 @@
    title = _"Further Exploration",
    body = boldreth(_"Boldreth says:",
 		_([[The first fortification Thron ordered has just been completed. At the moment, he seeks to bring trust and belief to those who live inside the walls of our new habitat that we named ‘Ondun’, which means ‘those who wait’ in the old tongue. But Thron is not yet satisfied – and I fully understand his fears: the forests are deep, and the frontier to Al’thunran is near. I am sure that there are a thousand greater dangers out there than the unknown tracks.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[To overlook more of the area around our hall, we should explore further and set up more guards and scouts to observe the frontier and keep an eye on the raging wars on our doorstep. THEN we will be prepared once trouble seeks to capture our woods.]]))
 		.. new_objectives(obj_explore_further)
 }
@@ -279,7 +276,7 @@
    title = _"Enhanced Economy and Training",
    body = boldreth(_"Boldreth says:",
 		_([[Our mining economy seems to work fine, that is already good news! Anyway, there are still a lot of men and women waiting in our hall to get a task, so they can help our soldiers to prepare for the war to come.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Our geologists found a lot more deposits of iron ore, coal and even gold. We should enhance our current mines as soon as our miners are more experienced. We should build up some more mines, a bigger food infrastructure to always supply our men with sufficient food and a further processing economy. But that’s still not everything – most of our soldiers are quite young and neither have a good weapon nor are they well trained. We should build up training sites to prepare them for their future tasks.]]))
 		.. new_objectives(obj_build_training_infrastructure)
 }
@@ -289,7 +286,7 @@
    title=_"Another Cold Day",
    body= thron(_"Thron looks worried…",
 		_([[My brothers and their soldiers are dead and left fire and destruction behind. In none of all the ruins could I find any man or woman of the normal folk, and so I just may hope that they fled from this cruel battleground and started a better life somewhere else.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Nothing is left of that beauty I remember, only ruins remain of the old capital. I am sorrowful but also relieved. I never hoped to see Al’thunran’s old beauty again – it was only a few months ago that I wondered whether I would ever be able to set my feet there again. Now the old town is back in my hands, and I will not hesitate to rebuild it with all the strength my people have. I can’t wait to see it again in its old beauty.]]))
 		..  objective_text(_"Victory",
 			_([[You have completed the last mission of the Barbarian tutorial campaign. You may continue playing if you wish, otherwise move on to the next campaign.]]))
@@ -300,9 +297,9 @@
    title = _"Military Assault",
    body = thron(_"Thron says:",
 		_([[So be it, the generals are out and about arranging my troops, and Boldreth himself will lead the first strike. I will ride by his side, to free Al’thunran of this war and return peace to our capital.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[When the young sun rises above the trees tomorrow morning, I will order the assault. By dusk, I will celebrate my victory in the wooden halls of the warlord and sacrifice a newborn lamb in the honor of my father, whose eyes are set upon me today.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[So be it!]]))
 		.. new_objectives(obj_military_assault_on_althunran),
 }

=== modified file 'campaigns/emp01.wmf/scripting/texts.lua'
--- campaigns/emp01.wmf/scripting/texts.lua	2015-07-25 08:07:44 +0000
+++ campaigns/emp01.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -28,7 +28,7 @@
    title=_"Build a barracks",
    number = 1,
    body = objective_text(_"Barracks",
-      listitem_bullet(_[[Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters.]])
+      li(_[[Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters.]])
    ),
 }
 
@@ -37,7 +37,7 @@
    title=_"Build a lumberjack’s house",
    number = 1,
    body = objective_text(_"Lumberjack’s House",
-      listitem_bullet(_[[Build a lumberjack’s house at the red house symbol, south of your provisional headquarters.]])
+      li(_[[Build a lumberjack’s house at the red house symbol, south of your provisional headquarters.]])
    ),
 }
 
@@ -46,7 +46,7 @@
    title=_"Build 2 lumberjack’s houses and a sawmill",
    number = 3,
    body = objective_text(_"Two Lumberjack’s Houses and a Sawmill",
-      listitem_bullet(_[[Build two more lumberjack’s houses and a sawmill as soon as there is enough space for them.]])
+      li(_[[Build two more lumberjack’s houses and a sawmill as soon as there is enough space for them.]])
    ),
 }
 
@@ -55,7 +55,7 @@
    title=_"Build a forester’s house",
    number = 1,
    body = objective_text(_"Forester’s House",
-      listitem_bullet(_[[Build a forester’s house to preserve the wood resources of this island.]])
+      li(_[[Build a forester’s house to preserve the wood resources of this island.]])
    ),
 }
 
@@ -64,13 +64,12 @@
    title=_"Build a quarry",
    number = 5,
    body = objective_text(_"Quarry",
-      listitem_bullet(_[[Build a quarry in the south to cut some stones and marble out of the rocks.]]) ..
-      listitem_arrow(_[[These might be used for future buildings.]])
+      li(_[[Build a quarry in the south to cut some stones and marble out of the rocks.]]) ..
+      li_arrow(_[[These might be used for future buildings.]])
    ),
 }
 
 
-
 -- ==================
 -- Texts to the user
 -- ==================
@@ -78,13 +77,13 @@
    title =_ "A Dark Night",
    body=lutius(_"Diary of Lutius",
 		_([[What has become of our Empire? I really ask this question – why did my king forbid me from fighting against that monstrous Barbarian tribe, who first acted as a peaceful friend and then attacked my army in the darkest night?]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[With an army of 150 men, I was assigned to patrol on our northern frontier, which lies near the Galdin Mountains in a great, beautiful and ancient forest. Soon, we met a Barbarian tribe, which at first was friendly. A few of my men even traded with them and their children came to us, to admire our clean and tidy uniforms and weapons.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[But during our fifth night in that region, they attacked us with no reason. I lost dozens of good men, and found myself imprisoned and brought to their chieftain. He spat at me, mocked me and told me to leave this land forever. He did not want new land and did not want our land, but he told me that THIS forest was their land – and it would stay theirs until the spirits took the last man of his folk!]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Three weeks later, I returned to Fremil to speak with our king. He was furious at the Barbarians, yet forbade any attack on these tribes. He believed that our army was too weak to survive in a war against the Barbarians.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Still, I saw no way that I could erase my shame without fighting against these Barbarians. So, I left Fremil by boat to find a new world and a new life for myself, somewhere in the south. Now I am sailing on the perl-gulf with my family, some of my friends and a few of my best warriors.]])),
    w=500,
    posy=1,
@@ -94,7 +93,7 @@
    title=_"The Rough Sea",
    body= lutius(_"Diary of Lutius",
 		_([[It seems as if sailing on the perl-gulf was one of our biggest mistakes. Nature was against us and drove us into a dark, wild storm. I really don’t know how many hours have passed since the waves rose higher than our boat, but still it would be suicide to go outside.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Our ship is badly damaged and is taking in more and more water. We can thank the Gods if we survive this black night with our lives.]])),
    w=400,
    posy=1,
@@ -104,9 +103,9 @@
    title=_"Survivor",
    body= lutius(_"Diary of Lutius",
 		_([[Finally, the Gods were with us!]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[We landed on an unknown coast and found peaceful rest under the palm trees growing at the shore. But that is about as good as it gets. The truth is: when I woke up this morning, I saw nothing but sand around us.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[It really seems as if we have landed under the only palm trees existing in this far-away sandy desert. I fear we won’t find the help we need to get our ship repaired in good time.]])),
    w=400,
    posy=1,
@@ -116,9 +115,9 @@
    title=_"A Foreboding",
    body= saledus(_"Saledus looks around nervously…",
 		_([[Sire, I fear we are not safe in this foreign land. Who knows what terrible creatures live beyond this forest, in that mighty desert? What if these creatures enter the woods and await the time to attack us?]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Well, perhaps my fear is misguided, but it can’t be wrong to keep watch in the forests – so that we can be sure to see any potential enemies before they can see us.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[You really should build a barracks in the eastern portion of the forest. Then one of my men can keep watch in the darkness and keep us safe from these creatures.]]))
 		.. new_objectives(obj_build_barracks),
    w=400,
@@ -129,7 +128,7 @@
    title=_"Safe For Now",
    body= saledus(_"Saledus speaks with a sigh of relief…",
 		_([[Sire, I saw that the construction of the barracks was completed, so I have assigned one of my best soldiers to it to keep watch on the desert.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[This is a good step forward. Now we can feel a bit safer and can look forward to repairing our ship.]])),
    w=400,
 }
@@ -138,9 +137,9 @@
    title=_"Young Amalea",
    body= amalea(_"Amalea smiles…",
 		_([[Greetings, Lutius! I just met Saledus outside.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[He told me about the barracks. Well, I don’t think we need more barracks – instead, we might concentrate on other things now.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[It is absolutely clear that we need wood to repair our ship. So, I walked through the forest yesterday to look for a nice place for a lumberjack’s house and found one right south of our provisional headquarters.]]))
 		.. new_objectives(obj_build_lumberjack),
    w=400,
@@ -150,7 +149,7 @@
    title=_"Young Amalea",
    body= amalea(_"Amalea recommends…",
 		_([[I got the message that our first lumberjack has started his work today. Perhaps it would be a good idea to wait until he cleans enough space for constructing two more lumberjack’s houses, so that we can harvest the logs faster.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[But unfortunately the logs are useless for repairing our ship – we need refined lumber, like every ship and every bigger building needs, too. So we should build a sawmill – as soon as we have enough space for this.]]))
 		.. new_objectives(obj_build_sawmill_and_lumberjacks),
    w=400,
@@ -160,13 +159,13 @@
    title=_"Young Amalea",
    body= amalea(_"Amalea comes in…",
 		_([[I’ve got two important things to talk about… First the good news:]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[I noticed that the construction of the sawmill is complete, so we can begin to refine the logs that the lumberjacks are harvesting into lumber.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[But the bad news is that our lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[These trees provide shelter from the sandstorms that sweep in from the desert, and shade on the hot days, and they are the home of many gentle animals. We shouldn’t leave this island a complete desert.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Lutius, please find someone who will take care of planting new trees.]]))
 		.. new_objectives(obj_build_forester),
    w=400,
@@ -176,7 +175,7 @@
    title=_"Thinking About the Future",
    body= saledus(_"Saledus notes…",
 		_([[Sire, I just thought about the rocks standing on the south shore of this land. Perhaps we could cut out some useful hard stones and beautiful marble.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[The repair of our ship will take a few weeks, anyway, and the resources we harvest now might be the base of strong and big buildings in another land.]]))
 		.. new_objectives(obj_build_quarry),
    w=400,
@@ -184,9 +183,9 @@
 
 saledus_4 = {
    title=_"A Step Forward",
-   body= saledus(_"Saledus looks excited…",
+   body= saledus(_"Saledus looks promising…",
 		_([[Sire, today we got a lot closer to our first castle. The quarry to the south began its work today and will soon provide us with stones and beautiful marble.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Now we truly can look forward to settling down on another island.]])),
    w=400,
 }
@@ -195,9 +194,9 @@
    title=_"Mission Complete",
    body= lutius(_"Diary of Lutius",
 		_([[Today I got the message that our ship is completely repaired. At the moment, my people are loading everything onto our newly repaired ship, hoping it will serve us better than last time.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Tonight will be our last night on this island. Tomorrow morning we will leave, searching for a new place for our exile.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[I still wonder if we will ever see Fremil again.]]))
 		.. objective_text(_"Victory",
 		_[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]),

=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua	2015-07-25 18:16:31 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -28,7 +28,7 @@
    title =_"Build up a wood economy",
    number = 5,
    body = objective_text(_"Wood Economy",
-      listitem_bullet(_[[Build three lumberjack’s houses, a forester’s house and a sawmill.]])
+      li(_[[Build three lumberjack’s houses, a forester’s house and a sawmill.]])
    ),
 }
 
@@ -37,7 +37,7 @@
    title =_"Build a quarry",
    number = 1,
    body = objective_text(_"Quarry",
-      listitem_bullet(_[[Build a quarry to the south of your headquarters.]])
+      li(_[[Build a quarry to the south of your headquarters.]])
    ),
 }
 
@@ -46,7 +46,7 @@
    title =_"Protect your colony",
    number = 1,
    body = objective_text(_"Protect Your Colony",
-      listitem_bullet(_[[Build some barracks and sentries around the colony.]])
+      li(_[[Build some barracks and sentries around the colony.]])
    ),
 }
 
@@ -55,7 +55,7 @@
    title =_"Start mining marble",
    number = 1,
    body = objective_text(_"Marble",
-      listitem_bullet(_[[Expand to the east, to start mining marble from the mountain.]])
+      li(_[[Expand to the east, to start mining marble from the mountain.]])
    ),
 }
 
@@ -64,7 +64,7 @@
    title =_"Build a stonemason and mining infrastructure",
    number = 7,
    body = objective_text(_"Stonemason and Mining Infrastructure",
-      listitem_bullet(_[[Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal kiln, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
+      li(_[[Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal kiln, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
    ),
 }
 
@@ -73,10 +73,10 @@
    title =_"Provide your miners with food",
    number = 1,
    body = objective_text(_"Food For Your Miners",
-      listitem_bullet(_[[To produce some sustaining food for our miners, we could build up a tavern. To supply them with some good and strong drinks, we could build up a brewery and a winery.]]) ..
-      listitem_bullet(_[[Of course this means we will need more resources for preparing this food – like fish, meat or bread. To provide these foodstuffs, you would have to build a fisher’s house, a farm, a mill and a bakery.]]) ..
-      listitem_bullet(_[[Maybe you will also need a hunter’s house, a piggery, a vineyard and some wells.]]) ..
-      listitem_arrow(_[[It’s up to you what you want to build. But remember – coal and iron ore mines need beer, marble and gold mines need wine and all mines need at least rations, which are produced out of bread OR meat OR fish.]])
+      li(_[[To produce some sustaining food for our miners, we could build up a tavern. To supply them with some good and strong drinks, we could build up a brewery and a winery.]]) ..
+      li(_[[Of course this means we will need more resources for preparing this food – like fish, meat or bread. To provide these foodstuffs, you would have to build a fisher’s house, a farm, a mill and a bakery.]]) ..
+      li(_[[Maybe you will also need a hunter’s house, a piggery, a vineyard and some wells.]]) ..
+      li_arrow(_[[It’s up to you what you want to build. But remember – coal and iron ore mines need beer, marble and gold mines need wine and all mines need at least rations, which are produced out of bread OR meat OR fish.]])
    ),
 }
 
@@ -85,8 +85,8 @@
    title =_"Protect your eastern frontier",
    number = 1,
    body = objective_text(_"Protect Your Eastern Frontier",
-      listitem_bullet(_[[Build up stronger military buildings, such as an outpost, a barrier or a tower, on the eastern frontier.]]) ..
-      listitem_arrow(_[[To watch deep inside the enemy territory, build a tower.]])
+      li(_[[Build up stronger military buildings, such as an outpost, a barrier or a tower, on the eastern frontier.]]) ..
+      li_arrow(_[[To watch deep inside the enemy territory, build a tower.]])
    ),
 }
 
@@ -95,8 +95,8 @@
    title =_"Destroy the Barbarian tribe",
    number = 2,
    body = objective_text(_"Destroy the Barbarian Tribe",
-      listitem_bullet(_[[As soon as you have enough soldiers, attack and completely destroy the Barbarian buildings.]]) ..
-      listitem_bullet(_[[Finally, build up a fortress on the peninsula (near where the Barbarian headquarters stood before), to avoid new settlements of other tribes in that region.]])
+      li(_[[As soon as you have enough soldiers, attack and completely destroy the Barbarian buildings.]]) ..
+      li(_[[Finally, build up a fortress on the peninsula (near where the Barbarian headquarters stood before), to avoid new settlements of other tribes in that region.]])
    ),
 }
 
@@ -108,7 +108,7 @@
    posy= 1,
    body = lutius(_"Diary of Lutius",
 		_([[Finally! This island appears to have been made for us, it is a gift from the Gods to my people and myself. Until now, we have only seen a small part of this island, but this part alone is already bringing sunlight to my mind. I feel as if we have found a priceless treasure, a land like paradise.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[On this island, we will start our new life. We will build up an outpost for our exile, which perhaps will become a new, beautiful home for every one of us.]])),
 }
 
@@ -117,9 +117,9 @@
    posy = 1,
    body= lutius(_"Diary of Lutius",
 		_([[As Saledus and I walked through these wonderful forests in the north, we felt that our future had just begun. This land is so peaceful, good and beautiful, I could stay here until the end of my life.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[But until that day, many years may pass! For now, we must concentrate on the present, and build a few lumberjack’s houses and a sawmill to produce some basic building materials.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[But we mustn’t forget to preserve this natural bounty. These forests should last forever, so we really have to build a forester’s house too.]]))
 		.. new_objectives(obj_build_woodeconomy)
 }
@@ -129,7 +129,7 @@
    posy = 1,
    body= lutius(_"Diary of Lutius",
 		_([[Later, I walked down to the rocks in the south and looked for a place where we could build a quarry to get some hard stone for our larger buildings.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Again, I felt like I was in paradise when I noticed that some marble-like stones were among the rocks. It seems that we will soon be able to build strong, luxurious buildings, like those we were accustomed to in Fremil.]]))
 		.. new_objectives(obj_build_quarry)
 }
@@ -153,9 +153,9 @@
    posy = 1,
    body= saledus(_"Saledus looks unhappy",
 		_([[Sire, I don’t want to start a panic, but I found something which gives me a sinking feeling in my stomach and spreads waves of fear in my heart. As I walked down to the southern shore, I found the remains of another ship. I don’t know whether these parts are all that is left of that ship. In any case, these parts do not seem to be old.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Perhaps the people aboard that ship were caught in the same storm which brought us to Malac’ Mor – and were brought to this island.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[I beg you to be cautious and to build some barracks or sentries around our colony.]]))
 		.. new_objectives(obj_build_military_buildings)
 }
@@ -164,9 +164,9 @@
    title =_ "Marble on the Mountain",
    body= saledus(_"Saledus smiles",
 		_([[Sire, I’ve got good news for you: As I walked to the east, I found a larger mountain. I am not absolutely sure – a geologist should check if I am right – but I believe we could mine marble from some places on the mountain.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[It would be a good source for bolstering our supply of quality marble, beyond the meager quantities available from the quarry. Perhaps you were right when you said that this island was like paradise.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Please, expand to that mountain and start mining marble.]]))
 		.. new_objectives(obj_build_marblemine)
 }
@@ -175,9 +175,9 @@
    title =_ "Further Mountains",
    body= saledus(_"Saledus is excited",
 		_([[By the Gods, this is an unbelievable stroke of fortune! There are two more mountains, and it seems that one has a large quantity of coal and the other of iron ore. I advise you to immediately build iron ore and coal mines (or at least charcoal kilns), smelting works, toolsmithies, armor and weapon smithies.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[However: for all these bigger buildings, we need better and more elegant building materials. So you have to build a stonemason, who will cut columns from marble.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[After everything, we can now begin to live like we did in Fremil.]]))
 		.. new_objectives(obj_build_mining_infrastructure)
 }
@@ -186,9 +186,9 @@
    title =_ "Food for the Miners",
    body= amalea(_"Amalea enters…",
 		_([[Lutius, don’t you think you forgot something important?]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[It’s nice, and of course a good idea, to build up mines, which will give us a more comfortable life, but the people working in the mines are unhappy with the current situation. They have to do hard work and have no time for making their own food.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[What do you think about helping them out? I can’t tell you what we need exactly… but here are my recommendations:]]))
 		.. new_objectives(obj_build_food_infrastructure)
 }
@@ -197,7 +197,7 @@
    title =_ "Our New Tavern",
    body= amalea(_"Amalea smiles",
 		_([[I just visited our new tavern ‘At the palms’. The beer they serve is really tasty. You really should have a drink there, too.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[It is good to see that we have now got a warmer and more familiar environment on our island. Thank you, Lutius.]]))
 }
 
@@ -206,11 +206,11 @@
    posy=1,
    body= lutius(_"Diary of Lutius",
 		_([[By the Gods! This is absolutely terrible. It seems as if we stand close to a test – and it seems as if Saledus was right with his fear concerning the shipwreck he found.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Today, as I walked down to the eastern shore, I got a shock. I caught sight of one of those hated, evil, Barbarian tribes with whom we have had so many problems before.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[At first, I was naive and hoped that they were peaceful, but as soon as one of them saw me, they charged towards me and started attacking me with their throwing spears. Thanks be to the Gods that I was able to flee and hide myself, before retreating back to our colony under cover of darkness.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[Anyway, we must build up stronger military buildings as soon as possible.]]))
 		.. new_objectives(obj_build_bigger_military_buildings)
 }
@@ -228,7 +228,7 @@
    posy=1,
    body= lutius(_"Diary of Lutius",
 		_([[Today is a proud day. We have fought for our new home and risen victorious.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[There are still a few Barbarians hiding on our island, but I am sure that we will find them soon. Every Barbarian who doesn’t attack us will be put in a boat with the other peaceful ones, and sent back to their country.]]))
 		..  objective_text(_"Victory",
 		_[[You have established a working economy, trained new soldiers and driven the Barbarians from the island.]])
@@ -238,7 +238,7 @@
    title =_ "As Time is Running By",
    w=200,
    h=150,
-   body=rt(p(_"7 days later…")),
+   body= p(_"7 days later…"),
 }
 
 diary_page_11 = {
@@ -246,8 +246,8 @@
    posy=1,
    body= lutius(_"Diary of Lutius",
 		_([[Today a pigeon landed on our island. It brought a message which fills me with dark thoughts and brings back my fears.]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[The message was addressed to me, begging me to come back to Fremil. It says that the Empire is at war with the Barbarians. They were attacked from the north by the tribe that I was forbidden to attack. It is clear to me what I must do…]])
-		.. paragraphdivider() ..
+		.. close_p() .. open_p() ..
 		_([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]))
 }

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2015-07-26 10:48:55 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -14,22 +14,18 @@
 -- =============
 scould_player = {
    title = _"Nice And Easy Does It All the Time",
-   body = rt(
-      p(_[[I am sorry, but will I have to tear this down again. We might need the space here later on. If I am too slow for you, you might want to play a real game and just find everything out for yourself. Otherwise, please bear with me, I am not the youngest and quickest anymore.]]
-      )
-   ),
+   body =
+      p(_[[I am sorry, but will I have to tear this down again. We might need the space here later on. If I am too slow for you, you might want to play a real game and just find everything out for yourself. Otherwise, please bear with me, I am not the youngest and quickest anymore.]]),
    h = 300,
    show_instantly = true
 }
 
 initial_message_01 = {
    title = _"Welcome to the Widelands Tutorial!",
-   body = rt(
+   body =
       h1(_"Welcome to Widelands!") ..
       p(_[[Widelands is a slow-paced build-up strategy game with an emphasis on construction rather than destruction. This tutorial will guide you through the basics of the game.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Dismiss this box by left-clicking on the button below.]])
-   ),
+      li(_[[Dismiss this box by left-clicking on the button below.]]),
    h = 300,
    w = 400
 }
@@ -37,31 +33,26 @@
    title = _"Diving In",
    position = "topright",
    field = sf,
-   body = rt(
+   body =
       h1(_"Let’s dive right in!") ..
       p(_[[There are three different tribes in Widelands: the Barbarians, the Empire and the Atlanteans. All tribes have a different economy, strength and weaknesses, but the general gameplay is the same for all. We will play the Barbarians for now.]]) ..
       p(_[[You will usually start the game with one headquarters. This is the big building with the blue flag in front of it. The headquarters is a warehouse that stores wares, workers and soldiers. Some wares are needed for building houses, others for making other wares. Obviously, the wares in the headquarters will not last forever, so you must make sure to replace them. The most important wares in the early game are the basic construction wares: logs and raw stone. Let’s make sure that we do not run out of logs. For this, we need a lumberjack and a hut for him to stay in.]]) ..
       p(_[[We need to find a nice place for the lumberjack’s hut. To make this easier, we can activate ‘Show Building Spaces’. There are two ways you can do this, either by clicking on the ‘Show Building Spaces’ button at the bottom of the screen, which is the fourth one from the left. Or you can use the SPACE key to toggle it.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Left-click the ‘OK’ button to close this box and then try it.]])
-   ),
+      li(_[[Left-click the ‘OK’ button to close this box and then try it.]]),
    obj_name = "enable_buildhelp",
    obj_title = _"Enable the showing of building spaces",
-   obj_body = rt(
+   obj_body =
       h1(_"Show Building Spaces") ..
       p(_[[It is easier to understand what type of buildings can be built on which field when the symbols for the building spaces are enabled.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Do so now, either by pressing SPACE or by clicking the fourth button from the left at the very bottom of the screen. Right-click on this window and then give it a try.]])
-   )
+      li(_[[Do so now, either by pressing SPACE or by clicking the fourth button from the left at the very bottom of the screen. Right-click on this window and then give it a try.]])
 }
 
 lumberjack_message_01 = {
    title = _"Lumberjack’s Spot",
    position = "topright",
    field = first_lumberjack_field,
-   body = rt(
-      p(_[[There you go. I will explain about all those symbols in a minute. First, let me show you how to make a lumberjack’s hut and how to connect it with a road. There is a sweet spot for a lumberjack right next to those trees. I’ll describe the steps I will take and then ask you to click on the ‘OK’ button for me to demonstrate.]])
-   ),
+   body =
+      p(_[[There you go. I will explain about all those symbols in a minute. First, let me show you how to make a lumberjack’s hut and how to connect it with a road. There is a sweet spot for a lumberjack right next to those trees. I’ll describe the steps I will take and then ask you to click on the ‘OK’ button for me to demonstrate.]]),
    h = 300,
    w = 350
 }
@@ -69,20 +60,17 @@
 lumberjack_message_02 = {
    title = _"Building the Lumberjack",
    position = "topright",
-   body = rt(
+   body =
       p(_[[First, I’ll left-click on the symbol where I want the lumberjack’s hut to be built. A window will appear where I can choose between buildings. Because I’ll click a yellow house symbol – which means that its field can house medium and small buildings – I am presented with all the medium buildings that I can build. The lumberjack’s hut is a small building, so I will go on to select the small buildings tab. Then I’ll choose the lumberjack’s hut.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Click the ‘OK’ button to watch me. I’ll go really slowly: I will click – then select the tab – and finally I’ll choose the building.]])
-   ),
+      li(_[[Click the ‘OK’ button to watch me. I’ll go really slowly: I will click – then select the tab – and finally I’ll choose the building.]]),
    h = 300
 }
 
 lumberjack_message_03a = {
    title = _"Building a Connecting Road",
    position = "topright",
-   body = rt(
-      p(_[[That won’t do yet. I still need to connect the lumberjack’s hut to the rest of my road network. After ordering the construction site, I was automatically put into road building mode, so all I have to do is click on the blue flag in front of my headquarters.]])
-   ),
+   body =
+      p(_[[That won’t do yet. I still need to connect the lumberjack’s hut to the rest of my road network. After ordering the construction site, I was automatically put into road building mode, so all I have to do is click on the blue flag in front of my headquarters.]]),
    show_instantly = true,
    h = 300,
    w = 350
@@ -91,9 +79,8 @@
 lumberjack_message_03b = {
    title = _"Building a Connecting Road",
    position = "topright",
-   body = rt(
-      p(_[[That won’t do yet. I still need to connect the lumberjack’s hut to the rest of my road network. You have disabled the option ‘Start building road after placing a flag’ (to change that, choose ‘Options’ in the Widelands main menu). Therefore, I have entered the road building mode manually. I will tell you later how to do that. To build the road, all I have to do now is click on the blue flag in front of my headquarters.]])
-   ),
+   body =
+      p(_[[That won’t do yet. I still need to connect the lumberjack’s hut to the rest of my road network. You have disabled the option ‘Start building road after placing a flag’ (to change that, choose ‘Options’ in the Widelands main menu). Therefore, I have entered the road building mode manually. I will tell you later how to do that. To build the road, all I have to do now is click on the blue flag in front of my headquarters.]]),
    show_instantly = true,
    h = 300,
    w = 350
@@ -102,9 +89,8 @@
 lumberjack_message_04 = {
    title = _"Waiting for the Lumberjack to Go Up",
    position = "topright",
-   body = rt(
-      p(_[[Now watch closely while a builder leaves the headquarters and goes to the construction site. Also, a carrier will take position in between the two blue flags and carry wares from one blue flag to the other.]])
-   ),
+   body =
+      p(_[[Now watch closely while a builder leaves the headquarters and goes to the construction site. Also, a carrier will take position in between the two blue flags and carry wares from one blue flag to the other.]]),
    h = 300,
    w = 350
 }
@@ -112,31 +98,25 @@
 lumberjack_message_05 = {
    title = _"Placing Another Flag",
    position = "topright",
-   body = rt(
+   body =
       p(_[[Nice how they are working, isn’t it? But the poor carrier has a very long way to go. We can make it easier for him (and more efficient for us) by placing another blue flag on the road.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[You try it this time: click on the yellow flag symbol in between the two blue flags we just placed and then click on the]])
-   ) ..
-   rt("image=pics/menu_build_flag.png", p(_"build flag symbol.")
-   ),
+      li(_[[You try it this time: click on the yellow flag symbol in between the two blue flags we just placed and then click on the]]) ..
+		p(img("pics/menu_build_flag.png") .. _"build flag symbol."),
    h = 300,
    obj_name = "build_flag_on_road_to_lumberjack",
    obj_title = _"Build a flag to divide the road to the lumberjack",
-   obj_body = rt(
+   obj_body =
       h1(_"Build a Flag on the Road") ..
       p(_[[The shorter your road segments are, the faster your wares will be transported. You should therefore make sure that your roads have as many flags as possible.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a blue flag now in the middle of the road that connects your headquarters to your lumberjack’s hut.]])
-   )
+      li(_[[Build a blue flag now in the middle of the road that connects your headquarters to your lumberjack’s hut.]])
 }
 
 lumberjack_message_06 = {
    title = _"Waiting For the Hut to be Finished",
    position = "topright",
-   body = rt(
+   body =
       p(_[[Well done! Let’s wait till the hut is finished.]]) ..
-      p(_[[If you want things to go faster, simply use the PAGE UP key on your keyboard to increase the game speed. You can use PAGE DOWN to make the game slower again.]])
-   ),
+      p(_[[If you want things to go faster, simply use the PAGE UP key on your keyboard to increase the game speed. You can use PAGE DOWN to make the game slower again.]]),
    h = 300,
    w = 350
 }
@@ -144,23 +124,21 @@
 flag_built = {
    title = _"Waiting for the Hut to be Finished",
    position = "topright",
-   body = rt(
+   body =
       p(_[[I wanted to teach you how to build new flags, but it seems you have already found out on your own. Well done!]]) ..
       p(_[[Now you have split the road in two parts with a carrier each. This means less work for him and higher efficiency for us. You should therefore always place as many flags as possible on your roads.]]) ..
       p(_[[Now we only have to wait till the hut is finished.]]) ..
-      p(_[[If you want things to go faster, simply use the PAGE UP key on your keyboard to increase the game speed. You can use PAGE DOWN to make the game slower again.]])
-   ),
+      p(_[[If you want things to go faster, simply use the PAGE UP key on your keyboard to increase the game speed. You can use PAGE DOWN to make the game slower again.]]),
    h = 350
 }
 
 construction_site_window = {
    title = _"The Construction Site",
-   body = rt(
+   body =
       h1(_"Let's see the progress") ..
       p(_[[If you click on the construction site, a window opens. You can see the wares that are still missing grayed out. You can also see the progress of this construction site.]]) ..
       -- The player doesn't know about the statistics yet. First things first.
-      p(_[[To close the window, simply right-click on it. All windows in Widelands can be closed that way, except the ones with instructions, like this one. Try it out!]])
-   ),
+      p(_[[To close the window, simply right-click on it. All windows in Widelands can be closed that way, except the ones with instructions, like this one. Try it out!]]),
    h = 300,
    w = 350
 }
@@ -168,42 +146,35 @@
 lumberjack_message_07 = {
    title = _"Lumberjack is Done",
    position = "topright",
-   body = rt(
-      p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the raw stone.]])
-   ),
+   body =
+      p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the raw stone.]]),
    h = 300,
    w = 350
 }
 
 inform_about_rocks = {
    title = _"Some Rocks Were Found",
-   body = rt(h1(_"Getting a Quarry Up")) ..
-   rt(
+   body =
+		h1(_"Getting a Quarry Up") ..
       p(_[[Stones can be mined in granite mines, but the easier way is to build a quarry next to some rocks lying around. As it happens, there is a pile of them just to the west (left) of your headquarters. I will teach you now how to move your view over there.]]) ..
-      paragraphdivider() ..
-      listitem_arrow(_[[There are three ways to move your view. The first one is using the cursor keys on your keyboard. Go ahead and try this out.]]) ..
-      listitem_bullet(_[[Click the ‘OK’ button and then move the view using the cursor keys]])
-   ),
+      li_arrow(_[[There are three ways to move your view. The first one is using the cursor keys on your keyboard. Go ahead and try this out.]]) ..
+      li(_[[Click the ‘OK’ button and then move the view using the cursor keys]]),
    h = 350,
    obj_name = "move_view_with_cursor_keys",
    obj_title = _"Move your view with the cursor keys",
-   obj_body = rt(
+   obj_body =
       h1(_"Moving Your View") ..
       p(_[[Moving your view is essential to get a complete overview of your whole economy. There are three ways to move your view in Widelands.]]) ..
-      paragraphdivider() ..
-      listitem_arrow(_[[The first one is to use the cursor keys on your keyboard.]]) ..
-      listitem_arrow(_[[The second one is the more common and faster one: press-and-hold the right mouse button anywhere on the map, then move your mouse around and you’ll see the view scroll.]]) ..
-      listitem_arrow(_[[The third one is to use the minimap. It is especially useful for traveling big distances.]])
-   )
+      li_arrow(_[[The first one is to use the cursor keys on your keyboard.]]) ..
+      li_arrow(_[[The second one is the more common and faster one: press-and-hold the right mouse button anywhere on the map, then move your mouse around and you’ll see the view scroll.]]) ..
+      li_arrow(_[[The third one is to use the minimap. It is especially useful for traveling big distances.]])
 }
 
 tell_about_right_drag_move = {
    title = _"Other Ways to Move the View",
-   body = rt(
+   body =
       p(_[[Excellent. Now there is a faster way to move, using the mouse instead:]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Simply right-click-and-hold anywhere on the map, then drag the mouse and instead of the cursor, the view will be moved. Try it.]])
-   ),
+      li(_[[Simply right-click-and-hold anywhere on the map, then drag the mouse and instead of the cursor, the view will be moved. Try it.]]),
    h = 300,
    w = 350,
    obj_name = "move_view_with_mouse",
@@ -213,30 +184,23 @@
 
 tell_about_minimap = {
    title = _"Use the minimap",
-   body = rt(
-      p(_[[Very good. And now about the minimap. You can open it by clicking on the]])
-   ) ..
-   rt("image=pics/menu_toggle_minimap.png", p(_[[minimap button at the bottom of the screen or simply by using the keyboard shortcut ‘m’.]])
-   ) ..
-   rt(
-      p(_[[The minimap shows the complete map in miniature. You can directly jump to any field by left-clicking on it. You can also toggle buildings, roads, flags and player indicators on and off inside the minimap.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Try it out. Open the minimap, click on a few buttons and try moving around. Close it when you have experimented enough.]])
-   ),
+   body =
+      p(_[[Very good. And now about the minimap. You can open it by clicking on the]]) ..
+		p(img("pics/menu_toggle_minimap.png") .. _[[minimap button at the bottom of the screen or simply by using the keyboard shortcut ‘m’.]]) ..
+		p(_[[The minimap shows the complete map in miniature. You can directly jump to any field by left-clicking on it. You can also toggle buildings, roads, flags and player indicators on and off inside the minimap.]]) ..
+		li(_[[Try it out. Open the minimap, click on a few buttons and try moving around. Close it when you have experimented enough.]]),
    h = 350,
    obj_name = "use_minimap",
    obj_title = _"Learn to use the minimap",
-   obj_body = rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Open the minimap by using the third button from the left on the bottom of your screen or the ‘m’ key.]]) ..
-      listitem_bullet(_[[Play around a bit with the different overlays (roads, flags, etc.)]]) ..
-      listitem_bullet(_[[Close the minimap when you are ready to continue by using the same button or ‘m’ again. Of course, a right-click also works.]])
-   )
+   obj_body =
+      li(_[[Open the minimap by using the third button from the left on the bottom of your screen or the ‘m’ key.]]) ..
+      li(_[[Play around a bit with the different overlays (roads, flags, etc.)]]) ..
+      li(_[[Close the minimap when you are ready to continue by using the same button or ‘m’ again. Of course, a right-click also works.]])
 }
 
 congratulate_and_on_to_quarry = {
    title = _"Onward to the Quarry",
-   body = rt(p(_[[Great. Now about that quarry…]])),
+   body = p(_[[Great. Now about that quarry…]]),
    h = 200,
    w = 250
 }
@@ -245,45 +209,35 @@
    field = first_quarry_field,
    position = "topright",
    title = _"How to Build a Quarry",
-   body = rt(
+   body =
       p(_[[Build a quarry next to those rocks here. Remember how I did it earlier?]]) ..
       p(_[[Make sure that you are showing the building spaces, then just click on the space were you want the building to be, choose it from the window that appears, and it is placed. Maybe this is a good time to explain about all those building space symbols we activated earlier.]]) ..
-      p(_[[You can build four things on fields in Widelands: flags, small houses, medium houses and big houses. But not every field can hold everything. The build space symbols ease recognition:]])
-   ) ..
-   rt("image=pics/big.png", p(_[[Everything can be built on the green house symbol.]])) ..
-   rt("image=pics/medium.png", p(_[[Everything except for big buildings can be built on a yellow house symbol.]])) ..
-   rt("image=pics/small.png", p(_[[Red building symbols can only hold small buildings and flags.]])) ..
-   rt("image=pics/set_flag.png", p(_[[And finally, the yellow flag symbol only allows for flags.]])) ..
-   rt(
-      p(_[[If you place something on a field, the surrounding fields might have less space for holding buildings, so choose your fields wisely.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Now go ahead, try it. The quarry is a small building, so if you click on a medium or big building symbol, you will have to select the small buildings tab first to find it. Go on, check it out!]])
-   ),
+      p(_[[You can build four things on fields in Widelands: flags, small houses, medium houses and big houses. But not every field can hold everything. The build space symbols ease recognition:]]) ..
+		p(img("pics/big.png") .. _[[Everything can be built on the green house symbol.]]) ..
+		p(img("pics/medium.png") .. _[[Everything except for big buildings can be built on a yellow house symbol.]]) ..
+		p(img("pics/small.png") .. _[[Red building symbols can only hold small buildings and flags.]]) ..
+		p(img("pics/set_flag.png") .. _[[And finally, the yellow flag symbol only allows for flags.]]) ..
+		p(_[[If you place something on a field, the surrounding fields might have less space for holding buildings, so choose your fields wisely.]]) ..
+		li(_[[Now go ahead, try it. The quarry is a small building, so if you click on a medium or big building symbol, you will have to select the small buildings tab first to find it. Go on, check it out!]]),
    obj_name = "build_a_quarry",
    obj_title = _"Build a quarry next to the rocks",
-   obj_body = rt(
+   obj_body =
       h1(_"Build a Quarry") ..
-      paragraphdivider() ..
-      listitem_bullet(_[[There are some rocks to the west of your headquarters. Build a quarry right next to them.]]) ..
-      listitem_arrow(_[[The quarry is a small building like the lumberjack’s hut. You can therefore build it on any field that shows a red, yellow or green house when the building spaces symbols are enabled (Press SPACE for that).]]) ..
-      listitem_arrow(_[[Just click on any house symbol next to the rocks, select the small buildings tab in the window that opens up, then click on the quarry symbol.]])
-   )
+      li(_[[There are some rocks to the west of your headquarters. Build a quarry right next to them.]]) ..
+      li_arrow(_[[The quarry is a small building like the lumberjack’s hut. You can therefore build it on any field that shows a red, yellow or green house when the building spaces symbols are enabled (Press SPACE for that).]]) ..
+      li_arrow(_[[Just click on any house symbol next to the rocks, select the small buildings tab in the window that opens up, then click on the quarry symbol.]])
 }
 
 talk_about_roadbuilding_00a = {
    position = "topright",
    field = wl.Game().map:get_field(9,12),
    title = _"Road Building",
-   body = rt(
-      p(_[[Excellent! Directly after placing the building, you have been switched into road building mode. The new road will start at the flag in front of your newly placed construction site. You can enter road building mode for any flag by left-clicking on a flag and selecting]])
-      ) ..
-   rt("image=pics/menu_build_way.png", p(_[[the road building symbol.]])) ..
-   rt(
-      p(_[[If you decide you do not want to build a road at this time, you can cancel road building by clicking on the starting flag of the road and selecting]])) ..
-   rt("image=pics/menu_abort.png", p(_[[the abort symbol.]])) ..
-   rt(
-      p(_[[Now, about this road. Remember: we are already in road building mode since you just ordered the quarry. You can either make it longer by one field at a time by left-clicking multiple times on neighboring fields for perfect control over the route the road takes, like so:]])
-   ),
+   body =
+      p(_[[Excellent! Directly after placing the building, you have been switched into road building mode. The new road will start at the flag in front of your newly placed construction site. You can enter road building mode for any flag by left-clicking on a flag and selecting]]) ..
+		p(img("pics/menu_build_way.png") .. _[[the road building symbol.]]) ..
+		p(_[[If you decide you do not want to build a road at this time, you can cancel road building by clicking on the starting flag of the road and selecting]]) ..
+		p(img("pics/menu_abort.png") .. _[[the abort symbol.]]) ..
+		p(_[[Now, about this road. Remember: we are already in road building mode since you just ordered the quarry. You can either make it longer by one field at a time by left-clicking multiple times on neighboring fields for perfect control over the route the road takes, like so:]]),
    show_instantly = true
 }
 
@@ -291,16 +245,12 @@
    position = "topright",
    field = road_building_field,
    title = _"Road Building",
-   body = rt(
-      p(_[[Excellent! To enter road building mode for any flag, left-click on a flag and select]])
-      ) ..
-   rt("image=pics/menu_build_way.png", p(_[[the road building symbol.]])) ..
-   rt(
-      p(_[[If you decide that you do not want to build a road at this time, you can cancel road building by clicking on the starting flag of the road and selecting]])) ..
-   rt("image=pics/menu_abort.png", p(_[[the abort symbol.]])) ..
-   rt(
-      p(_[[Now, about this road. I’ll enter the road building mode and then make it longer by one field at a time by left-clicking multiple times on neighboring fields for perfect control over the route the road takes, like so:]])
-   ),
+   body =
+      p(_[[Excellent! To enter road building mode for any flag, left-click on a flag and select]]) ..
+		p(img("pics/menu_build_way.png") .. _[[the road building symbol.]]) ..
+      p(_[[If you decide that you do not want to build a road at this time, you can cancel road building by clicking on the starting flag of the road and selecting]]) ..
+		p(img("pics/menu_abort.png") .. _[[the abort symbol.]]) ..
+      p(_[[Now, about this road. I’ll enter the road building mode and then make it longer by one field at a time by left-clicking multiple times on neighboring fields for perfect control over the route the road takes, like so:]]),
    show_instantly = true
 }
 
@@ -308,7 +258,7 @@
    position = "topright",
    field = road_building_field,
    title = _"Road Building",
-   body = rt(p(_[[Or, you can directly click the flag where the road should end, like so:]])),
+   body = p(_[[Or, you can directly click the flag where the road should end, like so:]]),
    h = 200,
    w = 250
 }
@@ -316,26 +266,20 @@
 talk_about_roadbuilding_02 = {
    position = "topright",
    title = _"Road Building",
-   body = rt(
-      p(_[[One more thing: around the field where your road would end, you can see different markers. They have the following meaning:]])
-   ) ..
-   rt("image=pics/roadb_green.png", p(_[[The terrain is flat here. Your carriers will be very swift on this terrain.]])) ..
-   rt("image=pics/roadb_yellow.png", p(_[[There is a small slope to climb to reach this field. This means that your workers will be faster walking downhill than they will be walking uphill.]])) ..
-   rt("image=pics/roadb_red.png", p(_[[The connection between the fields is extremely steep. The speed increase in one direction is huge while the slowdown in the other is also substantial.]])) ..
-   rt(
+   body =
+      p(_[[One more thing: around the field where your road would end, you can see different markers. They have the following meaning:]]) ..
+		p(img("pics/roadb_green.png") .. _[[The terrain is flat here. Your carriers will be very swift on this terrain.]]) ..
+		p(img("pics/roadb_yellow.png") .. _[[There is a small slope to climb to reach this field. This means that your workers will be faster walking downhill than they will be walking uphill.]]) ..
+		p(img("pics/roadb_red.png") .. _[[The connection between the fields is extremely steep. The speed increase in one direction is huge while the slowdown in the other is also substantial.]]) ..
       p(_[[Keep the slopes in mind while placing roads and use them to your advantage. Also, try to keep roads as short as possible and always remember to place as many flags as you can on road segments to share the load better. If you hold Ctrl or Shift+Ctrl while you finish the road, flags are placed automatically.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Now please rebuild the road between your quarry and your headquarters.]])
-   ),
+      li(_[[Now please rebuild the road between your quarry and your headquarters.]]),
    h = 450,
    obj_name = "build_road_to_quarry",
    obj_title = _"Connect the quarry to the headquarters",
-   obj_body = rt(
+   obj_body =
       h1(_"Connect Your Construction Site") ..
       p(_[[Connect your quarry construction site to your headquarters with a road. You would have been put directly into road building mode after ordering a new site. But now, you aren’t.]]) ..
-      paragraphdivider() ..
-      listitem_arrow(_[[To build a completely new road, just click on the flag in front of your construction site, click on the build road icon and then click on the flag in front of your headquarters. Wait for the completion of the quarry.]])
-   )
+      li_arrow(_[[To build a completely new road, just click on the flag in front of your construction site, click on the build road icon and then click on the flag in front of your headquarters. Wait for the completion of the quarry.]])
 }
 
 quarry_not_connected = {
@@ -359,35 +303,30 @@
 build_second_quarry = {
    position = "topright",
    title = _"Build a second quarry",
-   body = rt(
+   body =
       p(_[[When there are many rocks, you can consider building another quarry. This will make the stone production faster.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a second quarry near the rocks and connect it to your road network.]])
-   ),
+      li(_[[Build a second quarry near the rocks and connect it to your road network.]]),
    obj_name = "build_the_second_quarry",
    obj_title = _"Build another quarry",
-   obj_body = rt(
+   obj_body =
       h1(_"Build another quarry") ..
       p(_[[Build a second quarry next to the rocks. Do not forget to connect it to another flag.]]) ..
-      paragraphdivider() ..
-      listitem_arrow(_[[You can connect the new road to any flag of your existing road network. You can create junctions everywhere, not only in front of buildings.]])
-   ),
+      li_arrow(_[[You can connect the new road to any flag of your existing road network. You can create junctions everywhere, not only in front of buildings.]]),
    h = 300,
    w = 350
 }
 
 census_and_statistics_00 = {
    title = _"Census and Statistics",
-   body = rt(
+   body =
       p(_[[While we wait, I’ll quickly show you another useful feature. All construction sites look the same, and some buildings look alike. It is sometimes hard to tell them apart. Widelands offers a feature to show label texts over the buildings. They are called the ‘census’ and you can toggle them via the ‘c’ key or via the button on the ‘Watch’ tab of any field.]]) ..
       p(_[[Similar to this are the building statistics, which are also toggled via a button on the ‘Watch’ tab of any field. The hotkey for it is ‘s’. This will display information about the productivity of buildings or the progress of construction sites.]]) ..
       p(_[[Let me quickly enable these two for you. Remember: ‘c’ and ‘s’ are the keys. Alternatively, you can click on any field without a building on it, select the watch tab and then click on the corresponding buttons.]])
-   )
 }
 
 census_and_statistics_01 = {
    title = _"Census and Statistics",
-   body = rt(p(_[[Now we know what’s going on. Let’s wait for the quarries to finish.]])),
+   body = p(_[[Now we know what’s going on. Let’s wait for the quarries to finish.]]),
    h = 200,
    w = 250
 }
@@ -395,56 +334,45 @@
 teaching_about_messages = {
    popup = true,
    title = _"Introducing Messages",
-   body = rt(
+   body =
       h1(_"Messages") ..
       p(_[[Hi, it’s me again! This time, I have sent you a message. Messages are sent to you by Widelands to inform you about important events: empty mines, attacks on your tribe, won or lost military buildings, resources found…]]) ..
       p(_[[The message window can be toggled by the button on the very right at the bottom of the screen. This button will also change appearance whenever new messages are available, but there is also a bell sound played whenever you receive a new message.]]) ..
-      p(_[[You have two messages at the moment. This one, which you are currently reading, and the one that informed you that a new headquarters was added to your economy. Let’s learn how to archive messages: You can check them off in your inbox so that they get a tick-symbol in front of them. Then, you can click the]])
-   ) ..
-   rt("image=pics/message_archive.png", p(_[[archive message button to move them into your archive.]])) ..
-   rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Archive all messages that you currently have in your inbox, including this one.]])
-   ),
+      p(_[[You have two messages at the moment. This one, which you are currently reading, and the one that informed you that a new headquarters was added to your economy. Let’s learn how to archive messages: You can check them off in your inbox so that they get a tick-symbol in front of them. Then, you can click the]]) ..
+		p(img("pics/message_archive.png") .. _[[archive message button to move them into your archive.]]) ..
+      li(_[[Archive all messages that you currently have in your inbox, including this one.]]),
    obj_name = "archive_all_messages",
    obj_title = _"Archive all messages in your inbox",
-   obj_body = rt(
+   obj_body =
       h1(_"Archive Your Inbox Messages") ..
       p(_[[The message window is central to fully controlling your tribe’s fortune. However, you will get a lot of messages in a real game. To keep your head straight, you should try to keep the inbox empty. ]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Archive all your messages in your inbox now.]]) ..
-      listitem_arrow(_[[To do so, open the message window by pressing ‘n’ or clicking the rightmost button at the very bottom of the screen. Then mark all messages by checking the check box in front of them. Then, click the ‘Archive All’ button.]])
-   )
+      li(_[[Archive all your messages in your inbox now.]]) ..
+      li_arrow(_[[To do so, open the message window by pressing ‘n’ or clicking the rightmost button at the very bottom of the screen. Then mark all messages by checking the check box in front of them. Then, click the ‘Archive All’ button.]])
 }
 
 closing_msg_window_00 = {
    position = "topright",
    field = first_quarry_field,
    title = _"Closing Windows",
-   body = rt(
+   body =
       p(_[[Excellent. Do you remember how to close windows? You simply have to right-click on them. This will work with all windows except for story message windows like this one. Go ahead and try it.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[First, close this window by pressing the button below, then right-click into the messages window to close it.]])
-   ),
+      li(_[[First, close this window by pressing the button below, then right-click into the messages window to close it.]]),
    h = 300,
    w = 350,
    obj_name = "close_message_window",
    obj_title = _"Close the messages window",
-   obj_body = rt(
+   obj_body =
       h1(_"Close the Messages Window") ..
       p(_[[All windows in Widelands can be closed by right-clicking into them. Some windows can also be toggled with the buttons at the very bottom of the screen.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Close the messages window now by right-clicking into it.]])
-   )
+      li(_[[Close the messages window now by right-clicking into it.]])
 }
 
 closing_msg_window_01 = {
    position = "topright",
    field = first_quarry_field,
    title = _"Closing Windows",
-   body = rt(
-      p(_[[Well done! Let’s see how messages work in a real game, shall we? For this, I’ll take all rocks away from the poor stonemasons in the quarries. They will then send a message each that they can’t find any in their working areas the next time they try to do some work.]])
-   ),
+   body =
+      p(_[[Well done! Let’s see how messages work in a real game, shall we? For this, I’ll take all rocks away from the poor stonemasons in the quarries. They will then send a message each that they can’t find any in their working areas the next time they try to do some work.]]),
    h = 300,
    w = 350
 }
@@ -452,68 +380,58 @@
 destroy_quarries_message = {
    position = "topright",
    title = _"Messages Arrived!",
-   body = rt(
+   body =
       p(_[[You received some messages. See how the button at the bottom of the screen has changed appearance? You can destroy the quarries now as they are no longer of any use and just blocking space. To do so, there are two possibilities:]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Burning down the quarry: this is the fastest way of clearing the space. While the worker abandons the building, the wares are lost.]]) ..
-      listitem_bullet(_[[Dismantling the quarry: a builder will walk from the headquarters to dismantle the quarry piece by piece. Thereby, you regain some of the resources you used for the construction.]])
-   ),
+      li(_[[Burning down the quarry: this is the fastest way of clearing the space. While the worker abandons the building, the wares are lost.]]) ..
+      li(_[[Dismantling the quarry: a builder will walk from the headquarters to dismantle the quarry piece by piece. Thereby, you regain some of the resources you used for the construction.]]),
    h = 300,
    obj_name = "destroy_quarries",
    obj_title = "Destroy the two quarries",
-   obj_body = rt(
+   obj_body =
       p(_[[Since our quarries are useless now, you can destroy them and reuse the space later on.]]) ..
-      paragraphdivider() ..
-      listitem_arrow(_[[There are two different ways of destroying a building: burning down and dismantling. Try them both out on your quarries.]]) ..
-      listitem_arrow(_[[Burning down the quarry: This is the fastest way of clearing the space. While the worker abandons the building, the wares are lost.]]) ..
-      listitem_arrow(_[[Dismantling the quarry: A builder will walk from the headquarters to dismantle the quarry piece by piece. Thereby, you regain some of the resources you used for the construction.]])
-   )
+      li_arrow(_[[There are two different ways of destroying a building: burning down and dismantling. Try them both out on your quarries.]]) ..
+      li_arrow(_[[Burning down the quarry: This is the fastest way of clearing the space. While the worker abandons the building, the wares are lost.]]) ..
+      li_arrow(_[[Dismantling the quarry: A builder will walk from the headquarters to dismantle the quarry piece by piece. Thereby, you regain some of the resources you used for the construction.]])
 }
 
 introduce_expansion = {
    title = _"Expanding Your Territory!",
-   body = rt(
+   body =
       p(_[[There is one more thing I’d like to teach you now: Expanding your territory. The place that we started with around our headquarters is barely enough for a basic building infrastructure, and we do not have access to mountains, which we need to mine minerals and coal. So, we have to expand our territory.]]) ..
       p(_[[Expanding is as simple as building a military building at the edge of your territory. The Barbarians have a selection of different military buildings: sentries, barriers, donjons, fortresses and citadels. The bigger the building, the more expensive it is to build, but the more land it will conquer around itself and the more soldiers can be stationed there. The buildings also vary in their vision range: buildings with a tower see farther than others.]]) ..
       p(_[[As soon as a military building is manned, it will extend your land. I will tell your more about military buildings in another tutorial.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Let’s try it out now: build a military building on your border.]]) ..
-      listitem_arrow(_[[The sentry is the only military site that fits on a small building plot. If your lumberjack has cleared enough space, you can also build another military building.]])
-   ),
+      li(_[[Let’s try it out now: build a military building on your border.]]) ..
+      li_arrow(_[[The sentry is the only military site that fits on a small building plot. If your lumberjack has cleared enough space, you can also build another military building.]]),
    obj_name = "expand_territory",
    obj_title = _"Expand your territory",
-   obj_body = rt(
+   obj_body =
       h1(_"Make your territory grow") ..
       p(_[[In Widelands, it is necessary to build many buildings, which take up a lot of space. To expand your territory, you have to build military buildings next to your border. Every tribe has several military buildings.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[The Barbarians have four different military buildings you can build: the sentry (small), the barrier and the donjon (both medium) and the fortress (big). Just choose the one you like most.]]) ..
-      listitem_arrow(_[[Remember that big buildings (green icon) cannot be built on small (red) or medium (yellow) building plots, but buildings can be built on a building plot that provides more space than they need. You should always keep that in mind when you search for a suitable place.]])
-   )
+      li(_[[The Barbarians have four different military buildings you can build: the sentry (small), the barrier and the donjon (both medium) and the fortress (big). Just choose the one you like most.]]) ..
+      li_arrow(_[[Remember that big buildings (green icon) cannot be built on small (red) or medium (yellow) building plots, but buildings can be built on a building plot that provides more space than they need. You should always keep that in mind when you search for a suitable place.]])
 }
 
 
 military_building_finished = {
    title = _"Military Site Occupied",
-   body = rt(
+   body =
       h1(_"Your territory has just grown!") ..
       p(_[[Great. Do you see how your territory has grown since your soldiers entered your new military building?]]) ..
-      p(_[[Every military building has a certain conquer area – the more expensive the building, the more land it conquers.]])
-   ),
+      p(_[[Every military building has a certain conquer area – the more expensive the building, the more land it conquers.]]),
    h = 300,
    w = 350
 }
 
 conclude_tutorial = {
    title = _"Conclusion",
-   body = rt(
+   body =
       h1(_"Conclusion") ..
       p(_[[This concludes the first tutorial. In order to learn more about the game, I suggest to play one of the other tutorials. Each of them covers a different topic.]]) ..
       p(_[[However, since you now know how to control Widelands, you can also start a game (or continue this one) and discover more by yourself.]]) ..
-      p(_[[To leave this game and return to the main menu, click on the]])
-   ) ..
-   rt("image=pics/menu_options_menu.png", p(_[[‘Options’ menu button on the very left at the bottom of the screen. Then click the]])) ..
-   rt("image=pics/menu_exit_game.png", p(_[[‘Exit Game’ button.]])) ..
-   rt(p(_[[Thanks for playing this tutorial. Enjoy Widelands and remember to visit us at]])) ..
-   rt("text-align=center", "<p font-size=24 font-decoration=underline>http://www.widelands.org</p>"),
+      p(_[[To leave this game and return to the main menu, click on the]]) ..
+		p(img("menu_options_menu.png") .. _[[‘Options’ menu button on the very left at the bottom of the screen. Then click the]]) ..
+		p(img("pics/menu_exit_game.png") .. _[[‘Exit Game’ button.]]) ..
+		p(_[[Thanks for playing this tutorial. Enjoy Widelands and remember to visit us at]]) ..
+		p("halign=center", "<font size=24 underline=1>http://www.widelands.org</font>"),
    h = 450
 }

=== modified file 'campaigns/tutorial02_warfare.wmf/scripting/texts.lua'
--- campaigns/tutorial02_warfare.wmf/scripting/texts.lua	2015-07-26 10:35:59 +0000
+++ campaigns/tutorial02_warfare.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -15,199 +15,171 @@
 
 introduction = {
    title = _"Introduction",
-   body = rt(
+   body =
       h1(_"Soldiers, Training and Warfare") ..
       p(_[[In this scenario, I’m going to tell you about soldiers, their training and their profession: warfare. Although Widelands is about building up, not burning down, there is an enemy you sometimes have to defeat. Yet warfare is mainly focused on economics, not on military strategies, and its mechanics deserve explanation.]]) ..
-      p(_[[I’ve set up a small village that contains the most important buildings. You also have enough wares, so you do not have to take care of your weapons production. In a real game, you will not have this luxury.]])
-   ),
+      p(_[[I’ve set up a small village that contains the most important buildings. You also have enough wares, so you do not have to take care of your weapons production. In a real game, you will not have this luxury.]]),
    h = 300
 }
 
 abilities = {
    position = "topright",
    title = _"Soldiers’ abilities",
-   body = rt(
+   body =
       p(_[[A new soldier is created like a worker: when a military building needs a soldier, a carrier grabs the needed weapons and armor from a warehouse (or your headquarters) and walks up the road to your new building. Basic Barbarian soldiers do not use armor, they only need an ax.]]) ..
       p(_[[Take a look at the soldiers that are on their way to our military buildings. They look different from normal workers: they have a health bar over their head that displays their remaining health, and they have four symbols, which symbolize the individual soldier’s current levels in the four different categories: health, attack, defense and evade.]]) ..
-      p(_[[If a Barbarian soldier is fully trained, he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then! The individual abilities have the following meaning:]])
-   ) ..
-   rt("image=tribes/barbarians/soldier/hp_level0.png", h2(_"Health:"))..
-   rt(p(_[[The total life of a soldier. A Barbarian soldier starts with 130 health, and he will gain 28 health with each health level.]])) ..
-   rt("image=tribes/barbarians/soldier/attack_level0.png", h2(_"Attack:")) ..
-   rt(p(_[[The amount of damage a soldier will inflict on the enemy when an attack is successful. A Barbarian soldier with attack level 0 inflicts ~14 points of health damage when he succeeds in hitting an enemy. For each attack level, he gains 7 damage points.]])) ..
-   -- The Atlanteans' image, because the Barbarian one has a white background
-   rt("image=tribes/atlanteans/soldier/defense_level0.png", h2(_"Defense:")) ..
-   rt(p(_[[The defense is the percentage that is subtracted from the attack value. The Barbarians cannot train in this skill and therefore have always defense level 0, which means that the damage is always reduced by 3%. If an attacker with an attack value of 35 points hits a Barbarian soldier, the Barbarian will lose 35·0.97 = 34 health.]])) ..
-   rt("image=tribes/barbarians/soldier/evade_level0.png", h2(_"Evade:")) ..
-   rt(p(_[[Evade is the chance that the soldier is able to dodge an attack. A level 0 Barbarian has a 25% chance to evade an attack, and this increases in steps of 15% for each level.]]))
+      p(_[[If a Barbarian soldier is fully trained, he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then! The individual abilities have the following meaning:]]) ..
+		h2(img("tribes/barbarians/soldier/hp_level0.png") .. _"Health:")..
+		p(_[[The total life of a soldier. A Barbarian soldier starts with 130 health, and he will gain 28 health with each health level.]]) ..
+		h2(img("tribes/barbarians/soldier/attack_level0.png") .. _"Attack:") ..
+		p(_[[The amount of damage a soldier will inflict on the enemy when an attack is successful. A Barbarian soldier with attack level 0 inflicts ~14 points of health damage when he succeeds in hitting an enemy. For each attack level, he gains 7 damage points.]]) ..
+		-- The Atlanteans' image, because the Barbarian one has a white background
+		h2(img("tribes/atlanteans/soldier/defense_level0.png") .. _"Defense:") ..
+		p(_[[The defense is the percentage that is subtracted from the attack value. The Barbarians cannot train in this skill and therefore have always defense level 0, which means that the damage is always reduced by 3%. If an attacker with an attack value of 35 points hits a Barbarian soldier, the Barbarian will lose 35·0.97 = 34 health.]]) ..
+		h2(img("tribes/barbarians/soldier/evade_level0.png") .. _"Evade:") ..
+		p(_[[Evade is the chance that the soldier is able to dodge an attack. A level 0 Barbarian has a 25% chance to evade an attack, and this increases in steps of 15% for each level.]])
 }
 
 battlearena1 = {
    position = "topright",
    title = _"The Battle Arena",
-   body = rt(
+   body =
       p(_[[Now I have talked about training and levels. Let me elaborate on that.]]) ..
       p(_[[A newly created soldier has no experience and is not very good at fighting. To make him stronger, you can build training sites.]]) ..
       p(_[[One of these training sites is the battle arena. It is a big and expensive building, and it trains soldiers in evade. Since soldiers get very hungry during their workout, this building needs a lot of food and strongbeer. In a real game, you should have a good infrastructure before you build it.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[To see evade training in action, build a battle arena.]])
-   ),
+      li(_[[To see evade training in action, build a battle arena.]]),
    h = 350,
    obj_name = "build_battlearena",
    obj_title = _"Build a battle arena",
-   obj_body = rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a battle arena. It is a big building.]]) ..
-      listitem_arrow(_[[Since the construction will take some time, you can change the game speed using PAGE UP and PAGE DOWN.]])
-   )
+   obj_body =
+      li(_[[Build a battle arena. It is a big building.]]) ..
+      li_arrow(_[[Since the construction will take some time, you can change the game speed using PAGE UP and PAGE DOWN.]])
 }
 
 battlearena2 = {
    position = "topright",
    title = _"The Battle Arena",
-   body = rt(
+   body =
       h1(_"The Battle Arena Has Been Constructed") ..
       p(_[[Very good. Our battle arena has been finished, and the soldiers are already walking towards it.]]) ..
       -- Not perfectly correct (some training steps need either bread or meat), but we do not want to confuse new players
       p(_[[The needed wares are also delivered there. For successful training, you need pitta bread and strongbeer, as well as either fish or meat.]] .. " " ..
 		_[[For more information, you can have a look at the building’s help window, accessible via the question mark in every building’s window.]]) ..
-      p(_[[To learn how far your soldiers have progressed in their training, you can have a look at their icons. They are modified by red dots:]])
-   ) ..
-   rt("image=tribes/barbarians/soldier/evade_level0.png", p(_[[No red dots means that the soldier is not trained, so he has level 0. All your new recruits have this.]])) ..
-   rt("image=tribes/barbarians/soldier/evade_level1.png", p(_[[With every successful training step, your soldier becomes stronger. This is indicated by a red dot. This soldier is on level 1 in evade training.]])) ..
-   rt("image=tribes/barbarians/soldier/evade_level2.png", p(_[[When your soldier has reached the highest possible level (in this case level 2), this is indicated by a white background color.]])),
+      p(_[[To learn how far your soldiers have progressed in their training, you can have a look at their icons. They are modified by red dots:]]) ..
+		p(img("tribes/barbarians/soldier/evade_level0.png") .. _[[No red dots means that the soldier is not trained, so he has level 0. All your new recruits have this.]]) ..
+		p(img("tribes/barbarians/soldier/evade_level1.png") .. _[[With every successful training step, your soldier becomes stronger. This is indicated by a red dot. This soldier is on level 1 in evade training.]]) ..
+		p(img("tribes/barbarians/soldier/evade_level2.png") .. _[[When your soldier has reached the highest possible level (in this case level 2), this is indicated by a white background color.]]),
    h = 450
 }
 
 trainingcamp1 = {
    position = "topright",
    title = _"The Training Camp",
-   body = rt(
+   body =
       h1(_"The Training Camp") ..
       p(_[[There is a second training site: the training camp. It is a big building too, and to complement the battle arena, it trains attack and health (remember, the Barbarian soldiers cannot be trained in defense).]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a training camp.]])
-   ),
+      li(_[[Build a training camp.]]),
    h = 300,
    obj_name = "build_trainingcamp",
    obj_title = _"Build a training camp",
-   obj_body = rt(
+   obj_body =
       p(_[[The battle arena only trains the soldiers in evade. To get the strongest possible soldier, you also need to build a training camp, which trains them in attack and health.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a training camp.]])
-   )
+      li(_[[Build a training camp.]])
 }
 
 trainingcamp2 = {
    position = "topright",
    title = _"The Training Camp",
-   body = rt(
+   body =
       p(_[[Great, our training camp has now been finished, too. Now nothing will hinder us from getting the strongest warriors the world has ever seen.]]) ..
       p(_[[To train in the training camp, our soldiers need food like in the battle arena, but no strongbeer. Instead, they need different axes for attack training and helmets for health training.]]) ..
       p(_[[This equipment is produced in smithies out of coal, iron, and sometimes gold. You will learn more about this in the second scenario of the Barbarian campaign.]]) ..
       p(_[[You should also keep in mind that each of the three tribes in Widelands has its own way of training, so the buildings and wares are different. Also, the ability levels cannot be compared: an Imperial soldier with evade level 0 has a 30% chance of evading, while a Barbarian soldier at the same level only has a 25% chance.]])
-   )
 }
 
 heroes_rookies = {
    position = "topright",
    title = _"Heroes and Rookies",
-   body = rt(
+   body =
       h1(_"Heroes and Rookies") ..
       p(_[[While our soldiers are training, let me tell you what we can do with them.]]) ..
       p(_[[In every military building, you can set the preference for heroes (trained soldiers) or rookies. From time to time, a soldier will walk out of the building and be replaced by a stronger/weaker one automatically.]]) ..
       p(_[[The initial setting depends on the type of the building. For the Barbarians, the sentry is the only building that prefers rookies by default. You should change this setting to fit your current needs.]]) ..
       p(_[[When you are expanding into no man’s land, you can make your buildings prefer rookies. When you are planning to attack, send heroes into that region. Conquered buildings always prefer heroes.]])
-   )
 }
 
 soldier_capacity = {
    position = "topright",
    title = _"Soldier capacity",
-   body = rt(
+   body =
       h1(_"Adjusting the number of soldiers") ..
       p(_[[There is another way how you can control the strength of a military building: by the number of soldiers stationed there. Just click on the arrow buttons to decrease or increase the desired number of soldiers. Every building has a maximum capacity. In case of the barrier, it is five, for example.]]) ..
       p(_[[If you wish to send a certain soldier away, you can simply click on it. It will then be replaced by another soldier.]]) ..
       p(_[[Let me also describe what the numbers in the statistics string mean. This string can contain up to three numbers, e.g. ‘1 (+5) soldier (+2)’.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[The first number describes how many soldiers are currently in this building. In this example, only one soldier is left inside (each military building is always guarded by at least one soldier).]]) ..
-      listitem_bullet(_[[The second number tells you how many additional soldiers reside in this building, but are currently outside. The five soldiers may be attacking an enemy. They will return when they have been successful.]]) ..
-      listitem_bullet(_[[The third number indicates the missing soldiers. From the eight soldiers (1 + 5 + 2) you wish to have here, two may have died. They will be replaced by new soldiers from your warehouse, if possible.]])
-   )
+      li(_[[The first number describes how many soldiers are currently in this building. In this example, only one soldier is left inside (each military building is always guarded by at least one soldier).]]) ..
+      li(_[[The second number tells you how many additional soldiers reside in this building, but are currently outside. The five soldiers may be attacking an enemy. They will return when they have been successful.]]) ..
+      li(_[[The third number indicates the missing soldiers. From the eight soldiers (1 + 5 + 2) you wish to have here, two may have died. They will be replaced by new soldiers from your warehouse, if possible.]])
 }
 
 dismantle = {
    position = "topright",
    title = _"Dismantle your sentry",
-   body = rt(
+   body =
       h1(_"Dismantling military buildings") ..
       p(_[[You can only reduce the number of soldiers to one. The last soldier of a building will never come out (unless this building is attacked). If you want to have your soldier elsewhere, you will have to dismantle the building (buildings of an alien tribe cannot be dismantled, only be burned down).]]) ..
       p(_[[However, destroying a military building is always linked with a risk: the land is still yours, but it is no longer protected. Any enemy that builds his own military sites can take over that land without a fight, causing your buildings to burst into flames. Furthermore, some parts of the land can now be hidden under the fog of war. You should therefore only dismantle military buildings deep inside your territory where you are safe from enemies.]]) ..
       p(_[[Have you seen your sentry? Since it cannot contain many soldiers and is next to a stronger barrier, it is rather useless.]]) ..
-      paragraphdivider() ..
       -- TRANSLATORS: 'it' refers to the Barbarian sentry
-      listitem_bullet(_[[Dismantle it.]])
-   ) ..
-   rt(p(_[[You can also use this opportunity to become familiar with the other options: the heroes/rookies preference and the capacity.]])),
+      li(_[[Dismantle it.]]) ..
+		p(_[[You can also use this opportunity to become familiar with the other options: the heroes/rookies preference and the capacity.]]),
    obj_name = "dismantle_sentry",
    obj_title = _"Dismantle your north-western sentry",
-   obj_body = rt(
+   obj_body =
       p(_[[You can control the number of soldiers stationed at a military site with the arrow buttons. If you want to get even your last soldier out, you will have to destroy it. However, it then will no longer protect your territory, which will make it vulnerable to hostile attacks.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Dismantle your sentry in the north-west, next to the barrier.]])
-   )
+      li(_[[Dismantle your sentry in the north-west, next to the barrier.]])
 }
 
 fortress_enhancement = {
    position = "topright",
    title = _"Enhance Your Fortress",
-   body = rt(
+   body =
       h1(_"Enhancing Buildings") ..
       p(_[[Well done. Now you know how to draw back your soldiers from the places where you don’t need them. It is time to tell you how to reinforce your front line.]]) ..
       p(_[[Your fortress is already quite strong and conquers a lot of space. But there is an even bigger building: the citadel.]]) ..
       p(_[[Citadels can’t be built directly. Instead, you’ll have to construct a fortress first and then enhance it to a citadel. To do so, click on the fortress, then choose the ‘Enhance to Citadel’ button.]]) ..
       p(_[[Your soldiers will leave the fortress while the construction is going on. This means that your fortress will lose its military influence, as I described above.]]) ..
-      listitem_bullet(_[[Enhance your fortress to a citadel now.]])
-   ),
+      li(_[[Enhance your fortress to a citadel now.]]),
    obj_name = "enhance_fortress",
    obj_title = _"Enhance your fortress to a citadel",
-   obj_body = rt(
+   obj_body =
       h1(_"Enhance Your Fortress") ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Enhance your fortress to a mighty citadel.]]) ..
-      listitem_arrow(_[[The citadel can house 12 soldiers, and it is the biggest military building the Barbarians can build. It also costs a lot of resources and takes a long time to build. It is most suited to guard strategically important points like constricted points or mountains.]])
-   )
+      li(_[[Enhance your fortress to a mighty citadel.]]) ..
+      li_arrow(_[[The citadel can house 12 soldiers, and it is the biggest military building the Barbarians can build. It also costs a lot of resources and takes a long time to build. It is most suited to guard strategically important points like constricted points or mountains.]])
 }
 
 attack_enemy = {
    position = "topright",
    field = wl.Game().map:get_field(29,4), -- show the lost territory
    title = _"Defeat your Enemy",
-   body = rt(
+   body =
       h1(_"Defeat the Enemy") ..
       p(_[[Great work, the citadel is finished. But what’s that? A hostile tribe has settled next to us while the citadel was under construction! Do you see how they took away a part of our land? And our lumberjack has now lost his place of work. This is what I was talking about. Let’s take our land back and defeat the enemy!]]) ..
       p(_[[To attack a building, click on its doors, choose the number of soldiers that you wish to send and click on the ‘Attack’ button.]] .. " " .. _[[Your soldiers will come from all nearby military buildings. Likewise, the defenders will come from all nearby military buildings of the enemy and intercept your forces.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Attack and conquer all military buildings of the enemy and destroy their headquarters.]])
-   ),
+      li(_[[Attack and conquer all military buildings of the enemy and destroy their headquarters.]]),
    h = 350,
    obj_name = "defeated_the_empire",
    obj_title = _"Defeat the enemy tribe",
-   obj_body = rt(
+   obj_body =
       h1(_"Defeat Your Enemy") ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Defeat the nearby enemy.]]) ..
-      listitem_arrow(_[[To attack a building, click on its doors, choose the number of soldiers that you wish to send and click on the ‘Attack’ button.]])
-   )
+      li(_[[Defeat the nearby enemy.]]) ..
+      li_arrow(_[[To attack a building, click on its doors, choose the number of soldiers that you wish to send and click on the ‘Attack’ button.]])
 }
 
 conclude_tutorial = {
    title = _"Conclusion",
-   body = rt(
+   body =
       h1(_"Conclusion") ..
       p(_[[Thank you for playing this tutorial. I hope you enjoyed it and you learned how to create and train soldiers, how to control where they go and how to defeat an enemy. Did you see how easily you could overwhelm your enemy? Having trained soldiers is a huge advantage.]]) ..
       p(_[[But a war is expensive, and not always the path leading to the goal. When setting up a new game, you can also choose peaceful win conditions. You should definitely try them out, they’re worth it.]]) ..
       p(_[[You are now ready to play the campaigns. They will teach you about the different economies of the tribes. You can also play the remaining tutorials, but they are not crucial for succeeding in the campaigns.]])
-   )
 }
-

=== modified file 'campaigns/tutorial03_seafaring.wmf/scripting/texts.lua'
--- campaigns/tutorial03_seafaring.wmf/scripting/texts.lua	2015-05-31 13:45:13 +0000
+++ campaigns/tutorial03_seafaring.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -18,11 +18,10 @@
    position = "topright",
    field = sf,
    title = _"Seafaring",
-   body = rt(
+   body =
       h1(_"Seafaring Tutorial") ..
       p(_[[Welcome back. In this tutorial, you are going to learn the most important things about seafaring, that is ships, ports, and expedition.]]) ..
-      p(_[[But let me first give you an overview about your territory: here in the south, you have a whole economy with almost everything you need.]])
-   ),
+      p(_[[But let me first give you an overview about your territory: here in the south, you have a whole economy with almost everything you need.]]),
    h = 250
 }
 
@@ -30,22 +29,20 @@
    position = "topright",
    field = castle_field,
    title = _"The Northern Part",
-   body = rt(
+   body =
       p(_[[Here in the northern part, you only have a goldmine and a warehouse. While the miners are supplied well with food, there is no way to transport the gold ore to our smelting works in the southern part.]]) ..
       p(_[[We have tried to build a road, but the mountain is too wide and too steep. We therefore have only one possibility: we need to establish a sea lane between these two parts.]]) ..
-      p(_[[But I don’t want to rush you: you have just arrived here and you would probably like to have a closer look at your camp. I will also take a short break and be back soon.]])
-   ),
+      p(_[[But I don’t want to rush you: you have just arrived here and you would probably like to have a closer look at your camp. I will also take a short break and be back soon.]]),
    h = 350
 }
 
 tell_about_port = {
    position = "topright",
    title = _"Ports",
-   body = rt(
+   body =
       h1(_"Ports") ..
       p(_[[For everything you do on the high seas, you need a port at the shore. Ports are like headquarters: they can store wares, workers and soldiers. The soldiers inside will automatically come out when an enemy attacks the port.]]) ..
-      p(_[[Additionally, ports offer the possibility of transporting wares via ships. When you click on the port you already have, you will notice two additional tabs: wares and workers in the dock. They are waiting for a ship to transport them to another port. Currently, there are none because we have not yet built a second port. So let’s change this!]])
-   ),
+      p(_[[Additionally, ports offer the possibility of transporting wares via ships. When you click on the port you already have, you will notice two additional tabs: wares and workers in the dock. They are waiting for a ship to transport them to another port. Currently, there are none because we have not yet built a second port. So let’s change this!]]),
    h = 350
 }
 
@@ -53,82 +50,67 @@
    position = "topright",
    field = second_port_field,
    title = _"Building ports",
-   body = rt(
+   body =
       h1(_"How to build a port") ..
-      p(_[[Ports are big buildings, but they can only be built at special locations: those marked with the]])
-   ) ..
-   rt("image=pics/port.png", p(_[[blue port space icon.]])) ..
-   rt(
+      p(_[[Ports are big buildings, but they can only be built at special locations: those marked with the]]) ..
+		p(img("pics/port.png") .. _[[blue port space icon.]]) ..
       p(_[[Port spaces are set by the map designer, so a map will either contain them or not. They might, however, be hidden under trees or be blocked by surrounding buildings.]]) ..
       p(_[[You might already have noticed that you have such an icon next to your castle.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a port in the northern part of your camp.]])
-   ),
+      li(_[[Build a port in the northern part of your camp.]]),
    obj_name = "build_port",
    obj_title = _"Build a port in the northern part of your camp.",
-   obj_body = rt(
+   obj_body =
       h1(_"Build a port") ..
       p(_[[You always need a port when you want to transport wares with a ship.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a port next to your castle, on the blue port space icon.]]) ..
-      listitem_arrow(_[[Ports are built like normal buildings, but are only available on blue port spaces. Just click on a field with the icon and the building menu automatically offers you to build a port.]]) ..
-      listitem_arrow(_[[Although ports act as warehouses, you should not build more than necessary: they cost quartz, diamonds and gold, which makes them quite expensive.]])
-   ),
+      li(_[[Build a port next to your castle, on the blue port space icon.]]) ..
+      li_arrow(_[[Ports are built like normal buildings, but are only available on blue port spaces. Just click on a field with the icon and the building menu automatically offers you to build a port.]]) ..
+      li_arrow(_[[Although ports act as warehouses, you should not build more than necessary: they cost quartz, diamonds and gold, which makes them quite expensive.]]),
 }
 
 tell_about_shipyard = {
    position = "topright",
    title = _"Constructing ships",
-   body = rt(
+   body =
       h1(_"Let’s build ships") ..
       p(_[[Great. Your port has just been finished. Now we need some ships.]]) ..
       p(_[[Ships are constructed in a shipyard by a shipwright. We have to build one somewhere close to the shore.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a shipyard close to the coast. It is a medium building.]])
-   ),
+      li(_[[Build a shipyard close to the coast. It is a medium building.]]),
    h = 300,
    obj_name = "build_shipyard",
    obj_title = _"Build a shipyard",
-   obj_body = rt(
+   obj_body =
       h1(_"Build a shipyard") ..
       p(_[[Ships are produced in a shipyard.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a shipyard close to the shore of the southern part of your territory.]]) ..
-      listitem_arrow(_[[The shipyard is a medium building. Although it can be built everywhere on the map, the shipwright only works when he is close to the water and there are no trees or roads at the shoreline.]])
-   ),
+      li(_[[Build a shipyard close to the shore of the southern part of your territory.]]) ..
+      li_arrow(_[[The shipyard is a medium building. Although it can be built everywhere on the map, the shipwright only works when he is close to the water and there are no trees or roads at the shoreline.]]),
 }
 
 tell_about_ships = {
    position = "topright",
    title = _"Constructing ships",
-   body = rt(
+   body =
       h1(_"Waiting for the ships") ..
       p(_[[Very good. Your shipyard is finished and your shipwright immediately started working. For the construction of ships, he needs logs, planks and spidercloth, which will be transported to the shipyard.]] .. " " ..
 		_[[The shipwright will take the ware he needs to a free spot at the shoreline and build a ship there. When the first ship is finished, it will launch onto the sea, and the shipwright will construct another one.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[We should wait until we have two ships. That should be enough for now.]]) ..
-      listitem_arrow(_[[You need to stop your shipyard when you have enough ships. Otherwise, your shipwright will consume all your logs and spidercloth, producing dozens of ships.]])
-   ) ..
-   rt("image=pics/stop.png",p(_[[This is the icon for stopping production. You will find it in the building window.]])),
+      li(_[[We should wait until we have two ships. That should be enough for now.]]) ..
+      li_arrow(_[[You need to stop your shipyard when you have enough ships. Otherwise, your shipwright will consume all your logs and spidercloth, producing dozens of ships.]]) ..
+		p(img("pics/stop.png") .. _[[This is the icon for stopping production. You will find it in the building window.]]),
    obj_name = "wait_for_ships",
    obj_title = _"Construct two ships",
-   obj_body = rt(
+   obj_body =
       p(_[[Ships are constructed automatically when the shipyard is complete and the needed wares have been delivered.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Wait until the shipwright has constructed two ships.]]) ..
-      listitem_arrow(_[[Do not forget to stop your shipyard when you have enough ships.]])
-   )
+      li(_[[Wait until the shipwright has constructed two ships.]]) ..
+      li_arrow(_[[Do not forget to stop your shipyard when you have enough ships.]])
 }
 
 expedition1 = {
    position = "topright",
    title = _"No Iron",
-   body = rt(
+   body =
       h1(_"We lack iron") ..
       p(_[[The second ship might not be finished yet, but we have an urgent problem.]]) ..
       p(_[[As you surely have already noticed, there is no iron in the mountain in the west. We have plenty of coal and gold ore, but without iron ore, we cannot produce any tools.]]) ..
-      p(_[[Although it might take long and be expensive and not without dangers – who knows what monsters live in the sea? – I see no other possibility: we will have to undertake an expedition to the unknown seas.]])
-   ),
+      p(_[[Although it might take long and be expensive and not without dangers – who knows what monsters live in the sea? – I see no other possibility: we will have to undertake an expedition to the unknown seas.]]),
    h = 300
 }
 
@@ -136,58 +118,47 @@
    position = "topright",
    -- TRANSLATORS: This shall be the beginning of a poem
    title = _"A trip by the sea, what fun it can be",
-   body = rt(
+   body =
       h1(_"Expeditions") ..
-      p(_[[During an expedition, you send a ship out to discover new islands and maybe found a colony there.]])
-   ) ..
-   rt("image=pics/start_expedition.png",p(_[[Expeditions can be started in every port. Then, all needed wares are transported to that port. The wares are exactly those your tribe needs to build a port (your goal is to build a port far away from home, so this is not surprising), and of course you need a builder, too. When everything is prepared, a ship will come and pick it up.]] .. " " ..
+      p(_[[During an expedition, you send a ship out to discover new islands and maybe found a colony there.]]) ..
+		p(img("pics/start_expedition.png") .. _[[Expeditions can be started in every port. Then, all needed wares are transported to that port. The wares are exactly those your tribe needs to build a port (your goal is to build a port far away from home, so this is not surprising), and of course you need a builder, too. When everything is prepared, a ship will come and pick it up.]] .. " " ..
 		_[[You can check out the needed wares in the fifth tab of your port (it will appear when you’ve started an expedition).]]) ..
       p(_[[Now try this out. I will tell you later what the next steps are.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Start an expedition in any of your ports.]])
-   ),
+      li(_[[Start an expedition in any of your ports.]]),
    obj_name = "start_expedition",
    obj_title = _"Start an expedition",
-   obj_body = rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Start an expedition.]])
-   ) ..
-   rt("image=pics/start_expedition.png",p(_[[To do so, click on the ‘Start Expedition’ button in any port. A new tab where you can see the needed wares will appear.]])
-   )
+   obj_body =
+      li(_[[Start an expedition.]]) ..
+		p(img("pics/start_expedition.png") .. _[[To do so, click on the ‘Start Expedition’ button in any port. A new tab where you can see the needed wares will appear.]])
 }
 
 expedition3 = {
    position = "topright",
    title = _"Off to greener pastures",
-   body = rt(
+   body =
       h1(_"Start your expedition") ..
 		p(_[[Your expedition ship is ready. It is waiting for your orders in front of your port. It isn’t transporting wares anymore. Use its buttons to send your ship in any of the six main directions of the Widelands map. When it has reached a coastline, you can make it travel around the coast, where it will look for suitable places for landing.]] .. " " ..
 		_[[Once a port space has been found, you can construct a new port with the button in the center of the ship’s control window.]]) ..
       p(_[[The wares will then be unloaded, and the ship will take up the task of transporting wares once again. The builder will start his work and build a port.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Search for an island with a mountain, and look for a port space there. Colonize the island.]])
-   ),
+      li(_[[Search for an island with a mountain, and look for a port space there. Colonize the island.]]),
    obj_name = "found_settlement",
    obj_title = _"Found a settlement",
-   obj_body = rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Navigate your ship to an island that could contain iron ore.]]) ..
-      listitem_arrow(_[[When you click on the expedition ship, a window opens where you can control your ship.]]) ..
-      listitem_bullet(_[[When you have found a suitable port space, build a port there.]])
-   )
+   obj_body =
+      li(_[[Navigate your ship to an island that could contain iron ore.]]) ..
+      li_arrow(_[[When you click on the expedition ship, a window opens where you can control your ship.]]) ..
+      li(_[[When you have found a suitable port space, build a port there.]])
 }
 
 conclusion = {
    position = "topright",
    field = port_on_island,
    title = _"Conclusion",
-   body = rt(
+   body =
       h1(_"Congratulations") ..
       p(_[[You’ve lead the expedition to a successful end and founded a new colony. I’ve sent out some geologists – they already report that they’ve found some iron ore.]]) ..
       p(_[[In this scenario, you’ve learned everything about seafaring: how to build ports and ships and how to send out an expedition. Remember that expeditions are sometimes the fastest way to reach essential resources – and sometimes the only one.]]) ..
       p(_[[But I want to speak a word of warning. Ports are like headquarters: they can be attacked by a nearby enemy. While your headquarters has soldiers to defend it, your newly built port won’t. You should therefore avoid settling next to an enemy.]]) ..
-      p(_[[On this map, there is no enemy to fear. As always, you can continue playing and watch how the ships deliver wares to the island when you construct some buildings there. There is also another island where you can build a port.]])
-   ),
+      p(_[[On this map, there is no enemy to fear. As always, you can continue playing and watch how the ships deliver wares to the island when you construct some buildings there. There is also another island where you can build a port.]]),
    h = 450
 }
 

=== modified file 'campaigns/tutorial04_economy.wmf/scripting/texts.lua'
--- campaigns/tutorial04_economy.wmf/scripting/texts.lua	2015-06-10 16:50:57 +0000
+++ campaigns/tutorial04_economy.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -16,12 +16,11 @@
 
 intro1 = {
    title = _"Your Economy and its Settings",
-   body = rt(
+   body =
       h1(_[[Economy]]) ..
       p(_[[Welcome back. In this tutorial, I’ll tell you what you can do to check how well your economy works.]]) ..
       p(_[[Building your economy up and making it work well and grow is the main part of Widelands. But you can’t control the workers directly – they will follow the general conditions you set.]]) ..
-      p(_[[This is what I’ll show you in this tutorial: what actions can you take to define those general conditions?]])
-   ),
+      p(_[[This is what I’ll show you in this tutorial: what actions can you take to define those general conditions?]]),
    h = 300
 }
 
@@ -29,21 +28,19 @@
    position = "topright",
    field = field_near_border,
    title = _"A Peaceful Land",
-   body = rt(
+   body =
       p(_[[Now about the map: you have settled in a nice valley between two mountains, rich in marble, iron ore and coal. All were hoping for a peaceful life.]]) ..
       p(_[[But one day, you discovered a barren wasteland with abandoned buildings in the east. A strange aura came from there, and no one wanted to set foot there. But the border could not be left undefended, and so you constructed three castles.]]) ..
-      p(_[[You had not been prepared for war, and you have to hurry now to build up an army.]])
-   ),
+      p(_[[You had not been prepared for war, and you have to hurry now to build up an army.]]),
    h = 300
 }
 
 tavern_burnt_down = {
    position = "topright",
    title = _"The Tavern is Burning!",
-   body = rt(
+   body =
       h1(_[[An accident]]) ..
-      p(_[[Oh no, look at this: our tavern is burning! In all the hurry, our innkeeper accidentally dropped a torch. She is fine, but we could not extinguish the fire in time.]])
-   ),
+      p(_[[Oh no, look at this: our tavern is burning! In all the hurry, our innkeeper accidentally dropped a torch. She is fine, but we could not extinguish the fire in time.]]),
    w = 300,
    h = 250
 }
@@ -51,54 +48,43 @@
 building_stat = {
    position = "topright",
    title = _"Building statistics",
-   body = rt(
+   body =
       h1(_[[Check out your taverns]]) ..
-      p(_[[At first, we should find out how many taverns we currently have. Widelands offers you a window where you can easily check this.]])
-   ) ..
-   rt("image=pics/menu_toggle_menu.png",p(_[[First, you will have to open the statistics menu (you can find the corresponding button at the bottom). We will need this menu several times.]])) ..
-   rt("image=pics/menu_building_stats.png",p(_[[Afterwards, choose the ‘Building statistics’.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Open the building statistics window.]]) ..
-      listitem_arrow(_[[You can also use the hotkey ‘b’.]])
-   ),
+      p(_[[At first, we should find out how many taverns we currently have. Widelands offers you a list where you can easily check this.]]) ..
+		p(img("pics/menu_toggle_menu.png") .. _[[First, you will have to open the statistics menu (you can find the corresponding button at the bottom). We will need this menu several times.]]) ..
+		p(img("pics/menu_building_stats.png") .. _[[Afterwards, choose the ‘Building statistics’.]]) ..
+      li(_[[Open the building statistics window.]]) ..
+      li(_[[You can also use the hotkey ‘b’.]]),
    h = 350,
    obj_name = "open_building_stat",
    obj_title = _"Open the building statistics window.",
    obj_body =
-      rt("image=pics/menu_building_stats.png", p(_[[The building statistics window gives you an overview over the buildings you have.]])) ..
-   rt(
-      paragraphdivider() ..
+      p(img("pics/menu_building_stats.png") .. _[[The building statistics window gives you an overview over the buildings you have.]]) ..
       -- TRANSLATORS: "it" refers to the building statistics window
-      listitem_bullet(_[[Open it. You can access it from the statistics menu.]]) ..
-      listitem_arrow(_[[The statistics menu is accessed via the second button at the bottom. It provides several windows that give you information about the game.]])
-   )
+      li(_[[Open it. You can access it from the statistics menu.]]) ..
+      li_arrow(_[[The statistics menu is accessed via the second button at the bottom. It provides several windows that give you information about the game.]])
 }
 
 explain_building_stat = {
    title = _"Building Statistics",
-   body = rt(
+   body =
       p(_[[This is the building statistics window. It shows you all buildings you can own, sorted by their size.]]) ..
       p(_[[Let me now explain what all those numbers mean:]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[‘2/1’ below the quarry: This means that you have two quarries, plus another one which is under construction.]]) ..
-      listitem_bullet(_[[‘0%’: This indicates the average productivity of all buildings of that type. You have just started this game, therefore none of your buildings has done any work yet, but they are going to start working soon.]]) ..
-      listitem_bullet(_[[‘2/4’ below your sentry: For military buildings, the stationed soldiers are shown instead of a productivity. You want to have four soldiers in your sentries, but only two soldiers are stationed in this kind of building. This leaves two vacant positions — we really need more soldiers.]]) ..
-      listitem_arrow(_[[In both cases, the color (green - yellow - red) signals you how good the value is.]]) ..
-      listitem_bullet(_[[If you click on a building, you can scroll through the buildings of the selected type.]]) ..
-      listitem_bullet(_[[If you don’t have any building of a particular building type, it will be shown greyed out.]])
-   ) ..
-   rt(
+      li(_[[‘2/1’ below the quarry: This means that you have two quarries, plus another one which is under construction.]]) ..
+      li(_[[‘0%’: This indicates the average productivity of all buildings of that type. You have just started this game, therefore none of your buildings has done any work yet, but they are going to start working soon.]]) ..
+      li(_[[‘2/4’ below your sentry: For military buildings, the stationed soldiers are shown instead of a productivity. You want to have four soldiers in your sentries, but only two soldiers are stationed in this kind of building. This leaves two vacant positions — we really need more soldiers.]]) ..
+      li_arrow(_[[In both cases, the color (green - yellow - red) signals you how good the value is.]]) ..
+      li(_[[If you click on a building, you can scroll through the buildings of the selected type.]]) ..
+      li(_[[If you don’t have any building of a particular building type, it will be shown greyed out.]]) ..
       h2(_[[Now it’s your turn]]) ..
-      p(_[[This is enough explanation for now. Now try it out yourself. We want to know whether we still have taverns, so you have to choose the ‘Medium Buildings’ tab. Close the building statistics menu afterwards.]])
-   ),
+      p(_[[This is enough explanation for now. Now try it out yourself. We want to know whether we still have taverns, so you have to choose the ‘Medium Buildings’ tab. Close the building statistics menu afterwards.]]),
    obj_name = "check_taverns",
    obj_title = _"Look up your number of taverns in the building statistics window.",
-   obj_body = rt(
-      listitem_bullet(_[[Choose the ‘Medium Buildings’ tab in the building statistics window.]]) ..
-      listitem_bullet(_[[Look up how many taverns you have.]]) ..
-      listitem_arrow(_[[Below every building, there are two lines. The first one shows the number of buildings you own and how many are under construction. The second line shows the average productivity if it is a production site or training site, or the stationed and desired soldiers in military buildings.]]) ..
-      listitem_bullet(_[[Close the building statistics window when you are done.]])
-   )
+   obj_body =
+      li(_[[Choose the ‘Medium Buildings’ tab in the building statistics window.]]) ..
+      li(_[[Look up how many taverns you have.]]) ..
+      li_arrow(_[[Below every building, there are two lines. The first one shows the number of buildings you own and how many are under construction. The second line shows the average productivity if it is a production site or training site, or the stationed and desired soldiers in military buildings.]]) ..
+      li(_[[Close the building statistics window when you are done.]])
 }
 
 reopen_building_stat = {
@@ -116,9 +102,8 @@
    obj_title = _"Open the building statistics window again.",
    obj_body = rt(
       p(_[[You closed the building statistics window, although you have not yet looked up the number of taverns.]]) ..
-      paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the building statistics window.
-      listitem_bullet(_[[Please reopen it and choose the second tab (medium buildings).]])
+      li(_[[Please reopen it and choose the second tab (medium buildings).]])
    ),
    h = 250
 }
@@ -126,63 +111,52 @@
 inventory1 = {
    position = "topright",
    title = _"Stock",
-   body = rt(
+   body =
       h1(_[[Check for rations]]) ..
-      p(_[[OK. In the list, you’ve seen that you have no more taverns or inns. That means that you’re not producing any rations. But let’s see what we still have in stock.]])
-   ) ..
-   rt("image=pics/menu_stock.png",p(_[[Click on the ‘Stock’ button.]])) ..
-   rt(
-      paragraphdivider() ..
-      listitem_arrow(_[[You can also use the hotkey ‘i’ (as in ‘inventory’) to access this window quickly.]])
-   ),
+      p(_[[OK. In the list, you’ve seen that you have no more taverns or inns. That means that you’re not producing any rations. But let’s see what we still have in stock.]]) ..
+		p(img("pics/menu_stock.png") .. _[[Click on the ‘Stock’ button.]]) ..
+      li_arrow(_[[You can also use the hotkey ‘i’ (as in ‘inventory’) to access this window quickly.]]),
    h = 300,
    obj_name = "open_inventory",
    obj_title = _"Open your stock window.",
-   obj_body = rt(
+   obj_body =
       p(_[[The stock menu window gives you an overview over the wares you currently have.]]) ..
-      paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the stock menu window
-      listitem_bullet(_[[Open it. You can access it from the statistics menu.]]) ..
-      listitem_arrow(_[[The statistics menu is accessed via the second button at the bottom. It provides several windows that give you information about the game.]])
-   )
+      li(_[[Open it. You can access it from the statistics menu.]]) ..
+      li_arrow(_[[The statistics menu is accessed via the second button at the bottom. It provides several windows that give you information about the game.]])
 }
 
 inventory2 = {
    title = _"Stock",
-   body = rt(
+   body =
       p(_[[The stock menu window has four tabs. The first (and currently selected) one shows you all your current wares, including those on roads, at flags and inside buildings waiting for processing.]]) ..
       p(_[[Looking at the rations, there are currently only five in total, probably on their way to somewhere. Five rations are not much for such a big economy.]]) ..
       p(_[[The second tab shows you all your workers, again those on roads and in buildings summed up.]]) ..
-      p(_[[Now have a look at these two tabs. When you click on the]])) ..
-   rt("image=pics/menu_tab_wares_warehouse.png",p(_[[third tab (‘Wares in warehouses’), I’ll continue.]])
-   ),
+      p(_[[Now have a look at these two tabs. When you click on the]]) ..
+		p(img("pics/menu_tab_wares_warehouse.png") .. _[[third tab (‘Wares in warehouses’), I’ll continue.]]),
    h = 350,
    show_instantly = true,
    obj_name = "switch_stock_tab",
    obj_title = _"Switch to the third tab in the stock menu window.",
-   obj_body = rt(
+   obj_body =
       p(_[[Have a look at the first two tabs in the stock menu window. They show all the wares and workers you have.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[When you have seen enough, switch to the third tab.]])
-   ),
+      li(_[[When you have seen enough, switch to the third tab.]]),
 }
 
 inventory3 = {
    title = _"Stock",
-   body = rt(
+   body =
       p(_[[The third tab shows you the wares that are stored in your headquarters, your warehouses and ports. They are not needed anywhere and are therefore your reserve.]]) ..
       p(_[[The fourth tab shows the same thing for workers.]]) ..
-      p(_[[The third tab tells you that there are no rations left in your headquarters – that’s not good!]])
-   ),
+      p(_[[The third tab tells you that there are no rations left in your headquarters – that’s not good!]]),
    show_instantly = true,
    h = 300
 }
 
 reopen_stock_menu = {
    title = _"You closed the stock window!",
-   body = rt(
-      p(_[[You have closed the stock menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the third tab?]])
-   ),
+   body =
+      p(_[[You have closed the stock menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the third tab?]]),
    show_instantly = true,
    w = 300,
    h = 250
@@ -191,51 +165,43 @@
 reopen_stock_menu_obj = {
    obj_name = "open_stock_menu_again",
    obj_title = _"Open the stock window again.",
-   obj_body = rt(
+   obj_body =
       p(_[[You closed the stock menu window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
-      paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the stock menu window.
-      listitem_bullet(_[[Otherwise, please reopen it and choose the third tab.]])
-   ),
+      li(_[[Otherwise, please reopen it and choose the third tab.]]),
    h = 250
 }
 
 build_taverns = {
    position = "topright",
    title = _"New taverns",
-   body = rt(
+   body =
       h1(_[[We need new taverns]]) ..
       p(_[[Now that you have an overview, you should act. I think we should build more than one tavern – two or three are better. Remember: as long as we don’t produce rations, our miners won’t dig for ore. And without iron, we cannot forge a single helm.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build at least two taverns.]])
-   ),
+      li(_[[Build at least two taverns.]]),
    h = 300,
    obj_name = "build_taverns",
    obj_title = _"Build new taverns.",
-   obj_body = rt(
+   obj_body =
       p(_[[To make our mines work, we need rations again – the more, the better.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build at least two taverns.]])
-   )
+      li(_[[Build at least two taverns.]])
 }
 
 ware_encyclopedia = {
    title = _"Ware Encyclopedia",
-   body = rt(
+   body =
       p(_[[I am not sure if you could follow my remarks. Why do we need rations to get soldiers?]]) ..
       p(_[[When you’ve played a lot, you will know such things by heart. But when you’re unsure what this tribe needs for a special ware, you can easily look it up in your tribe’s ware encyclopedia.]]) ..
-      p(_[[This encyclopedia can be accessed via]])
-   ) ..
-   rt("image=pics/menu_help.png",p(_[[the help button at the bottom. For all your tribe’s wares, it shows a short help text, a list of buildings that produces the ware and the needed wares.]]) ..
-      p(_[[If you want, you can try it out. A soldier needs a wood lance and a helm – from there on out, you can search backwards.]])
-   ),
+      p(_[[This encyclopedia can be accessed via]]) ..
+		p(img("pics/menu_help.png") .. _[[the help button at the bottom. For all your tribe’s wares, it shows a short help text, a list of buildings that produces the ware and the needed wares.]]) ..
+      p(_[[If you want, you can try it out. A soldier needs a wood lance and a helm – from there on out, you can search backwards.]]),
    h = 350
 }
 
 building_priority_settings = {
    position = "topright",
    title = _"Priority Settings",
-   body = rt(
+   body =
       h1(_[[Send the wares where they’re needed]]) ..
       p(_[[Great. Our taverns have now been built up and are supplying us with rations.]]) ..
       p(_[[At the moment, all mines are supplied with rations. If you want to prioritize a special mine, you simply have to open its window. In the wares tab, behind every ware, you can see ‘traffic lights’.]]) ..
@@ -243,91 +209,73 @@
       p(_[[In our situation, you might want to work the bakeries as fast as possible because they supply our taverns, so you could set water to the highest priority for them. The other buildings (for example the donkey farm) would then get less water, but the bakery could work faster.]])
       -- we cannot check whether the user does this, so no objective
       -- see bug https://bugs.launchpad.net/widelands/+bug/1380288
-   )
 }
 
 ware_stats1 = {
    position = "top",
    title = _"Ware Statistics",
-   body = rt(
-      p(_[[In the statistics menu, there is also a]])) ..
-      rt("image=pics/menu_ware_stats.png",p(_[[‘Ware statistics’ button.]])) ..
-      rt(paragraphdivider() ..
+   body =
+      p(_[[In the statistics menu, there is also a]]) ..
+      p(img("pics/menu_ware_stats.png") .. _[[‘Ware statistics’ button.]]) ..
       -- TRANSLATORS: "it" refers to the ware statistics button
-      listitem_bullet(_[[Click on it.]])
-   ),
+      li(_[[Click on it.]]),
    w = 200,
    h = 200,
    obj_name = "open_ware_stat",
    obj_title = _"Open the ware statistics window.",
-   obj_body = rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Open the ‘Ware statistics’ window, accessed via the statistics menu.]])
-   )
+   obj_body =
+      li(_[[Open the ‘Ware statistics’ window, accessed via the statistics menu.]])
 }
 
 ware_stats2 = {
    title = _"Ware Statistics",
-   body = rt(
+   body =
       p(_[[In this menu window, you can select wares to see how their production or consumption has changed over time. Try it out with some wares.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[I’ll continue as soon as you click on the]])) ..
-   rt("image=pics/menu_tab_wares_econ_health.png",p(_[[third tab (‘Economy Health’).]])
-   ),
+      li(_[[I’ll continue as soon as you click on the]]) ..
+		p(img("pics/menu_tab_wares_econ_health.png") .. _[[third tab (‘Economy Health’).]]),
    h = 250,
    show_instantly = true,
    obj_name = "switch_ware_stat_tab_to_third",
    obj_title = _"Switch to the third tab in the ware statistics menu window.",
-   obj_body = rt(
+   obj_body =
       p(_[[The first two tabs show you the production and consumption of any ware. You can toggle them by simply clicking on them.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[When you have seen enough, switch to the third tab.]])
-   )
+      li(_[[When you have seen enough, switch to the third tab.]])
 }
 
 ware_stats3 = {
    title = _"Ware Statistics",
-   body = rt(
+   body =
       p(_[[In this tab, you can see the difference between production and consumption, called ‘economy health’. You can see at one glance which one of those two is higher for the selected ware, that means whether the amount increases or decreases.]]) ..
       p(_[[Now try this out. You can also compare it with the two previous tabs.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Click on the last tab when I should continue.]])
-   ),
+      li(_[[Click on the last tab when I should continue.]]),
    h = 250,
    show_instantly = true,
    obj_name = "switch_ware_stat_tab_to_forth",
    obj_title = _"Switch to the last tab in the ware statistics menu window.",
-   obj_body = rt(
+   obj_body =
       p(_[[The third tab shows you the economy health of the ware. When the value is positive, this means your stock is growing.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[When you have seen enough, switch to the fourth tab.]])
-   )
+      li(_[[When you have seen enough, switch to the fourth tab.]])
 }
 
 ware_stats4 = {
    title = _"Ware Statistics",
-   body = rt(
+   body =
       p(_[[In the last tab, you can also see your absolute stock. It will increase when the economy health is positive, and decrease otherwise. Compare the two graphs!]]) ..
       p(_[[The last two tabs are good indicators to see whether shortages are about to come. Don’t forget to check them regularly!]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Close this window when you’re done.]])
-   ),
+      li(_[[Close this window when you’re done.]]),
    h = 250,
    show_instantly = true,
    obj_name = "close_ware_stats",
    obj_title = _"Close the ware statistics window.",
-   obj_body = rt(
+   obj_body =
       p(_[[The stock tab shows you how many wares you have. Compare the information from the four tabs to understand the correlation.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[When you have finished, close the ware statistics window.]])
-   ),
+      li(_[[When you have finished, close the ware statistics window.]]),
 }
 
 reopen_ware_stats1 = {
    title = _"You closed the ware statistics window!",
-   body = rt(
-      p(_[[You have closed the ware statistics menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the third tab?]])
-   ),
+   body =
+      p(_[[You have closed the ware statistics menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the third tab?]]),
    show_instantly = true,
    w = 300,
    h = 250
@@ -336,19 +284,16 @@
 reopen_ware_stats1_obj = {
    obj_name = "open_ware_stats_menu_again1",
    obj_title = _"Open the ware statistics window again.",
-   obj_body = rt(
+   obj_body =
       p(_[[You closed the ware statistics menu window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
-      paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the ware statistics window.
-      listitem_bullet(_[[Otherwise, please reopen it and choose the third tab.]])
-   )
+      li(_[[Otherwise, please reopen it and choose the third tab.]])
 }
 
 reopen_ware_stats2 = {
    title = _"You closed the ware statistics window!",
-   body = rt(
-      p(_[[You have closed the ware statistics menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the fourth tab?]])
-   ),
+   body =
+      p(_[[You have closed the ware statistics menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the fourth tab?]]),
    show_instantly = true,
    w = 300,
    h = 250
@@ -357,101 +302,85 @@
 reopen_ware_stats2_obj = {
    obj_name = "open_ware_stats_menu_again2",
    obj_title = _"Open the ware statistics window again.",
-   obj_body = rt(
+   obj_body =
       p(_[[You closed the ware statistics menu window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
-      paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the ware statistics window.
-      listitem_bullet(_[[Otherwise, please reopen it and choose the fourth tab.]])
-   )
+      li(_[[Otherwise, please reopen it and choose the fourth tab.]])
 }
 
 economy_settings1 = {
    position = "topright",
    title = _"Economy options",
-   body = rt(
+   body =
       p(_[[I’ve shown you our stock menu window, where you could see which wares are at the warehouses. You remember?]]) ..
-      p(_[[Now I’ll tell you how you can determine how many wares you want to have. The menu window for this purpose can be accessed via any flag and is called ‘Configure economy’.]])) ..
-   -- Yup, that's indeed the correct icon
-   rt("image=pics/genstats_nrwares.png",p(_[[This is the icon.]])) ..
-   rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Open this window.]])
-   ),
+      p(_[[Now I’ll tell you how you can determine how many wares you want to have. The menu window for this purpose can be accessed via any flag and is called ‘Configure economy’.]]) ..
+		-- Yup, that's indeed the correct icon
+		p(img("pics/genstats_nrwares.png") .. _[[This is the icon.]]) ..
+      li(_[[Open this window.]]),
    h = 350,
    obj_name = "open_economy_settings",
    obj_title = _"Open the ‘Configure economy’ window.",
-   obj_body = rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Open the ‘Configure economy’ window.]]) ..
-      listitem_arrow(_[[The window can be accessed by clicking on any flag you own.]])
-   )
+   obj_body =
+      li(_[[Open the ‘Configure economy’ window.]]) ..
+      li_arrow(_[[The window can be accessed by clicking on any flag you own.]])
 }
 
 economy_settings2 = {
    title = _"Economy options",
-   body = rt(
+   body =
       p(_[[This window looks similar to the stock window, but it has additional buttons at the bottom.]]) ..
       p(_[[You first have to select one or more wares (you can also left-click and drag). Then you can set the desired target quantity for the selected wares.]]) ..
       p(_[[Most buildings will only produce something when when the stock level in your warehouses falls below the target quantity, so you should indicate the reserve you want to stockpile.]]) ..
       p(_[[An example: the default value for scythes is 1. If you build a farm, a carrier will take a scythe and become a farmer. Then there will be no scythes left, but the target quantity is 1, therefore your toolsmith will start producing another one.]]) ..
-      p(_[[If you build two farms, only one of them will start working immediately. The second farm will have to wait for its worker, who will lack a scythe. If you had set the target quantity to 2 before, two scythes would have been available and both farms would have been able to start working right away.]])
-   ),
+      p(_[[If you build two farms, only one of them will start working immediately. The second farm will have to wait for its worker, who will lack a scythe. If you had set the target quantity to 2 before, two scythes would have been available and both farms would have been able to start working right away.]]),
    h = 450
 }
 
 economy_settings3 = {
    title = _"Economy options",
-   body = rt(
+   body =
       p(_[[By changing the target quantity, you can therefore decide which wares/tools your resources (in this case: iron) should be turned into or whether you would like to save your iron and wait until you know what you will need it for.]]) ..
       p(_[[Only buildings that consume wares care about this setting. Buildings that produce wares for free (e.g. your farms or wells) will always keep working.]]) ..
       p(_[[Now let’s try it out: the current target quantity for marble columns is 10. Increase it to be prepared in case you will have to build up your fortifications quickly.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Set the target quantity for marble columns to 20 and wait for your stonemason to produce them.]])
-   ),
+      li(_[[Set the target quantity for marble columns to 20 and wait for your stonemason to produce them.]]),
    obj_name = "produce_marble_columns",
    obj_title = "Produce 20 marble columns.",
-   obj_body = rt(
+   obj_body =
       p(_[[Sometimes, you will need many wares at the same time quickly – faster than they can be produced. In this case, it is good to have enough on reserve.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[To be prepared for additional fortifications, you should produce 20 marble columns.]]) ..
-      listitem_arrow(_[[Your stonemason will not produce marble columns when they are not needed. You have to increase the target quantity.]]) ..
-      listitem_arrow(_[[To do so, click on any flag and choose ‘Configure economy’. In this menu window, you can decide how many wares of each type you wish to have in stock.]])
-   )
+      li(_[[To be prepared for additional fortifications, you should produce 20 marble columns.]]) ..
+      li_arrow(_[[Your stonemason will not produce marble columns when they are not needed. You have to increase the target quantity.]]) ..
+      li_arrow(_[[To do so, click on any flag and choose ‘Configure economy’. In this menu window, you can decide how many wares of each type you wish to have in stock.]])
 }
 
 warehouse_preference_settings = {
    field = warehouse_field,
    position = "topright",
    title = _"Warehouse Preferences",
-   body = rt(
+   body =
       h1(_[[Bring the marble columns to the front line]]) ..
       p(_[[It is great that we are producing marble columns, but it would be great if they were stored where we need them.]]) ..
       p(_[[Normally, produced wares are brought to the closest warehouse if they are not needed elsewhere. In this case, this means our headquarters. But we would like to have them in the warehouse near our fortresses.]]) ..
       p(_[[Every warehouse has four buttons to set the preference. If you move your mouse pointer over them, you will see tooltips that explain what the buttons do.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Bring all the marble columns to the warehouse near the front line.]]) ..
-      listitem_arrow(_[[To achieve this, you will have to do two things. First, set a preference for marble columns in the desired warehouse. All marble columns produced in the future will be brought there if possible.]]) ..
-      listitem_arrow(_[[Then, to move the marble columns out of your headquarters, you will have to click on the remove button there.]])
-   ),
+      li(_[[Bring all the marble columns to the warehouse near the front line.]]) ..
+      li_arrow(_[[To achieve this, you will have to do two things. First, set a preference for marble columns in the desired warehouse. All marble columns produced in the future will be brought there if possible.]]) ..
+      li_arrow(_[[Then, to move the marble columns out of your headquarters, you will have to click on the remove button there.]]),
    obj_name = "bring_marble_columns_to_front",
    obj_title = _"Bring 20 marble columns to the front line.",
-   obj_body = economy_settings3.obj_body .. rt(
+   obj_body = economy_settings3.obj_body ..
       p(_[[To decide where your wares get stored, you can use the preference buttons in the warehouses.]]) ..
-      listitem_bullet(_[[Bring all the marble columns to the warehouse near the front line.]]) ..
-      listitem_arrow(_[[To achieve this, you will have to do two things. First, set a preference for marble columns in the desired warehouse. All marble columns produced in the future will be brought there if possible.]]) ..
-      listitem_arrow(_[[Then, to move the marble columns out of your headquarters, you will have to click on the remove button there.]])
-   )
+      li(_[[Bring all the marble columns to the warehouse near the front line.]]) ..
+      li_arrow(_[[To achieve this, you will have to do two things. First, set a preference for marble columns in the desired warehouse. All marble columns produced in the future will be brought there if possible.]]) ..
+      li_arrow(_[[Then, to move the marble columns out of your headquarters, you will have to click on the remove button there.]])
 }
 
 conclusion = {
    title = _"Borders Secured",
-   body = rt(
+   body =
       h1(_[[We’re safe now]]) ..
       p(_[[Great. We now have enough marble columns so that in case of an aggressor, we can build up our fortifications. But I do not think that that will be necessary. So far, no enemy has shown up.]]) ..
       p(_[[I hope I could teach you how you can control the economy in Widelands. There are many options and they can be confusing at first. Even if you’ve only understood a few concepts, you mustn’t give up. Try them out in some games, become familiar with them and experience the possibilities. Then, return to this tutorial and learn the rest!]]) ..
       p([[]]) ..
-      p(_[[This was the last tutorial I had prepared for you. I’ve now taught you everything I know. There are still secrets hidden in this world even I don’t know about. I will now search for a quiet place to spend my sunset years. If you have still questions, the Widelands community will surely help you. You can find it at:]])
-   ) ..
-   rt("text-align=center", "<p font-size=24 font-decoration=underline>http://www.widelands.org</p>")
+      p(_[[This was the last tutorial I had prepared for you. I’ve now taught you everything I know. There are still secrets hidden in this world even I don’t know about. I will now search for a quiet place to spend my sunset years. If you have still questions, the Widelands community will surely help you. You can find it at:]]) ..
+		p("halign=center", "<font size=24 underline=1>http://www.widelands.org</font>")
 }
 

=== added file 'cmake/Modules/FindICU.cmake'
--- cmake/Modules/FindICU.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Modules/FindICU.cmake	2015-08-01 06:21:02 +0000
@@ -0,0 +1,315 @@
+# Downloaded from https://github.com/julp/FindICU.cmake
+#
+# This module can find the International Components for Unicode (ICU) Library
+#
+# Requirements:
+# - CMake >= 2.8.3 (for new version of find_package_handle_standard_args)
+#
+# The following variables will be defined for your use:
+#   - ICU_FOUND             : were all of your specified components found (include dependencies)?
+#   - ICU_INCLUDE_DIRS      : ICU include directory
+#   - ICU_LIBRARIES         : ICU libraries
+#   - ICU_VERSION           : complete version of ICU (x.y.z)
+#   - ICU_MAJOR_VERSION     : major version of ICU
+#   - ICU_MINOR_VERSION     : minor version of ICU
+#   - ICU_PATCH_VERSION     : patch version of ICU
+#   - ICU_<COMPONENT>_FOUND : were <COMPONENT> found? (FALSE for non specified component if it is not a dependency)
+#
+# For windows or non standard installation, define ICU_ROOT variable to point to the root installation of ICU. Two ways:
+#   - run cmake with -DICU_ROOT=<PATH>
+#   - define an environment variable with the same name before running cmake
+# With cmake-gui, before pressing "Configure":
+#   1) Press "Add Entry" button
+#   2) Add a new entry defined as:
+#     - Name: ICU_ROOT
+#     - Type: choose PATH in the selection list
+#     - Press "..." button and select the root installation of ICU
+#
+# Example Usage:
+#
+#   1. Copy this file in the root of your project source directory
+#   2. Then, tell CMake to search this non-standard module in your project directory by adding to your CMakeLists.txt:
+#     set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+#   3. Finally call find_package() once, here are some examples to pick from
+#
+#   Require ICU 4.4 or later
+#     find_package(ICU 4.4 REQUIRED)
+#
+#   if(ICU_FOUND)
+#      include_directories(${ICU_INCLUDE_DIRS})
+#      add_executable(myapp myapp.c)
+#      target_link_libraries(myapp ${ICU_LIBRARIES})
+#   endif(ICU_FOUND)
+
+#=============================================================================
+# Copyright (c) 2011-2013, julp
+#
+# Distributed under the OSI-approved BSD License
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#=============================================================================
+
+find_package(PkgConfig QUIET)
+
+########## Private ##########
+if(NOT DEFINED ICU_PUBLIC_VAR_NS)
+    set(ICU_PUBLIC_VAR_NS "ICU")                          # Prefix for all ICU relative public variables
+endif(NOT DEFINED ICU_PUBLIC_VAR_NS)
+if(NOT DEFINED ICU_PRIVATE_VAR_NS)
+    set(ICU_PRIVATE_VAR_NS "_${ICU_PUBLIC_VAR_NS}")       # Prefix for all ICU relative internal variables
+endif(NOT DEFINED ICU_PRIVATE_VAR_NS)
+if(NOT DEFINED PC_ICU_PRIVATE_VAR_NS)
+    set(PC_ICU_PRIVATE_VAR_NS "_PC${ICU_PRIVATE_VAR_NS}") # Prefix for all pkg-config relative internal variables
+endif(NOT DEFINED PC_ICU_PRIVATE_VAR_NS)
+
+function(icudebug _VARNAME)
+    if(${ICU_PUBLIC_VAR_NS}_DEBUG)
+        if(DEFINED ${ICU_PUBLIC_VAR_NS}_${_VARNAME})
+            message("${ICU_PUBLIC_VAR_NS}_${_VARNAME} = ${${ICU_PUBLIC_VAR_NS}_${_VARNAME}}")
+        else(DEFINED ${ICU_PUBLIC_VAR_NS}_${_VARNAME})
+            message("${ICU_PUBLIC_VAR_NS}_${_VARNAME} = <UNDEFINED>")
+        endif(DEFINED ${ICU_PUBLIC_VAR_NS}_${_VARNAME})
+    endif(${ICU_PUBLIC_VAR_NS}_DEBUG)
+endfunction(icudebug)
+
+set(${ICU_PRIVATE_VAR_NS}_ROOT "")
+if(DEFINED ENV{ICU_ROOT})
+    set(${ICU_PRIVATE_VAR_NS}_ROOT "$ENV{ICU_ROOT}")
+endif(DEFINED ENV{ICU_ROOT})
+if (DEFINED ICU_ROOT)
+    set(${ICU_PRIVATE_VAR_NS}_ROOT "${ICU_ROOT}")
+endif(DEFINED ICU_ROOT)
+
+set(${ICU_PRIVATE_VAR_NS}_BIN_SUFFIXES )
+set(${ICU_PRIVATE_VAR_NS}_LIB_SUFFIXES )
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    list(APPEND ${ICU_PRIVATE_VAR_NS}_BIN_SUFFIXES "bin64")
+    list(APPEND ${ICU_PRIVATE_VAR_NS}_LIB_SUFFIXES "lib64")
+endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+list(APPEND ${ICU_PRIVATE_VAR_NS}_BIN_SUFFIXES "bin")
+list(APPEND ${ICU_PRIVATE_VAR_NS}_LIB_SUFFIXES "lib")
+
+set(${ICU_PRIVATE_VAR_NS}_COMPONENTS )
+# <icu component name> <library name 1> ... <library name N>
+macro(icu_declare_component _NAME)
+    list(APPEND ${ICU_PRIVATE_VAR_NS}_COMPONENTS ${_NAME})
+    set("${ICU_PRIVATE_VAR_NS}_COMPONENTS_${_NAME}" ${ARGN})
+endmacro(icu_declare_component)
+
+icu_declare_component(data icudata)
+icu_declare_component(uc   icuuc)         # Common and Data libraries
+icu_declare_component(i18n icui18n icuin) # Internationalization library
+icu_declare_component(io   icuio ustdio)  # Stream and I/O Library
+icu_declare_component(le   icule)         # Layout library
+icu_declare_component(lx   iculx)         # Paragraph Layout library
+
+########## Public ##########
+set(${ICU_PUBLIC_VAR_NS}_FOUND TRUE)
+set(${ICU_PUBLIC_VAR_NS}_LIBRARIES )
+set(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS )
+set(${ICU_PUBLIC_VAR_NS}_C_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_CXX_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_CPP_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_C_SHARED_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_CXX_SHARED_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_CPP_SHARED_FLAGS "")
+foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PRIVATE_VAR_NS}_COMPONENTS})
+    string(TOUPPER "${${ICU_PRIVATE_VAR_NS}_COMPONENT}" ${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT)
+    set("${ICU_PUBLIC_VAR_NS}_${${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT}_FOUND" FALSE) # may be done in the icu_declare_component macro
+endforeach(${ICU_PRIVATE_VAR_NS}_COMPONENT)
+
+# Check components
+if(NOT ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS) # uc required at least
+    set(${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS uc)
+else(NOT ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS)
+    list(APPEND ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS uc)
+    list(REMOVE_DUPLICATES ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS)
+    foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS})
+        if(NOT DEFINED ${ICU_PRIVATE_VAR_NS}_COMPONENTS_${${ICU_PRIVATE_VAR_NS}_COMPONENT})
+            message(FATAL_ERROR "Unknown ICU component: ${${ICU_PRIVATE_VAR_NS}_COMPONENT}")
+        endif(NOT DEFINED ${ICU_PRIVATE_VAR_NS}_COMPONENTS_${${ICU_PRIVATE_VAR_NS}_COMPONENT})
+    endforeach(${ICU_PRIVATE_VAR_NS}_COMPONENT)
+endif(NOT ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS)
+
+# Includes
+find_path(
+    ${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS
+    NAMES unicode/utypes.h utypes.h
+    HINTS ${${ICU_PRIVATE_VAR_NS}_ROOT}
+    PATH_SUFFIXES "include"
+    DOC "Include directories for ICU"
+)
+
+if(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS)
+    ########## <part to keep synced with tests/version/CMakeLists.txt> ##########
+    if(EXISTS "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/uvernum.h") # ICU >= 4
+        file(READ "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/uvernum.h" ${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS)
+    elseif(EXISTS "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/uversion.h") # ICU [2;4[
+        file(READ "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/uversion.h" ${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS)
+    elseif(EXISTS "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/utypes.h") # ICU [1.4;2[
+        file(READ "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/utypes.h" ${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS)
+    elseif(EXISTS "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/utypes.h") # ICU 1.3
+        file(READ "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/utypes.h" ${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS)
+    else()
+        message(FATAL_ERROR "ICU version header not found")
+    endif()
+
+    if(${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS MATCHES ".*# *define *ICU_VERSION *\"([0-9]+)\".*") # ICU 1.3
+        # [1.3;1.4[ as #define ICU_VERSION "3" (no patch version, ie all 1.3.X versions will be detected as 1.3.0)
+        set(${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION "1")
+        set(${ICU_PUBLIC_VAR_NS}_MINOR_VERSION "${CMAKE_MATCH_1}")
+        set(${ICU_PUBLIC_VAR_NS}_PATCH_VERSION "0")
+    elseif(${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS MATCHES ".*# *define *U_ICU_VERSION_MAJOR_NUM *([0-9]+).*")
+        #
+        # Since version 4.9.1, ICU release version numbering was totaly changed, see:
+        # - http://site.icu-project.org/download/49
+        # - http://userguide.icu-project.org/design#TOC-Version-Numbers-in-ICU
+        #
+        set(${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION "${CMAKE_MATCH_1}")
+        string(REGEX REPLACE ".*# *define *U_ICU_VERSION_MINOR_NUM *([0-9]+).*" "\\1" ${ICU_PUBLIC_VAR_NS}_MINOR_VERSION "${${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS}")
+        string(REGEX REPLACE ".*# *define *U_ICU_VERSION_PATCHLEVEL_NUM *([0-9]+).*" "\\1" ${ICU_PUBLIC_VAR_NS}_PATCH_VERSION "${${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS}")
+    elseif(${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS MATCHES ".*# *define *U_ICU_VERSION *\"(([0-9]+)(\\.[0-9]+)*)\".*") # ICU [1.4;1.8[
+        # [1.4;1.8[ as #define U_ICU_VERSION "1.4.1.2" but it seems that some 1.4.1(?:\.\d)? have releasing error and appears as 1.4.0
+        set(${ICU_PRIVATE_VAR_NS}_FULL_VERSION "${CMAKE_MATCH_1}") # copy CMAKE_MATCH_1, no longer valid on the following if
+        if(${ICU_PRIVATE_VAR_NS}_FULL_VERSION MATCHES "^([0-9]+)\\.([0-9]+)$")
+            set(${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION "${CMAKE_MATCH_1}")
+            set(${ICU_PUBLIC_VAR_NS}_MINOR_VERSION "${CMAKE_MATCH_2}")
+            set(${ICU_PUBLIC_VAR_NS}_PATCH_VERSION "0")
+        elseif(${ICU_PRIVATE_VAR_NS}_FULL_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+            set(${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION "${CMAKE_MATCH_1}")
+            set(${ICU_PUBLIC_VAR_NS}_MINOR_VERSION "${CMAKE_MATCH_2}")
+            set(${ICU_PUBLIC_VAR_NS}_PATCH_VERSION "${CMAKE_MATCH_3}")
+        endif()
+    else()
+        message(FATAL_ERROR "failed to detect ICU version")
+    endif()
+    set(${ICU_PUBLIC_VAR_NS}_VERSION "${${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION}.${${ICU_PUBLIC_VAR_NS}_MINOR_VERSION}.${${ICU_PUBLIC_VAR_NS}_PATCH_VERSION}")
+    ########## </part to keep synced with tests/version/CMakeLists.txt> ##########
+
+    # Check dependencies (implies pkg-config)
+    if(PKG_CONFIG_FOUND)
+        set(${ICU_PRIVATE_VAR_NS}_COMPONENTS_DUP ${${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS})
+        foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PRIVATE_VAR_NS}_COMPONENTS_DUP})
+            pkg_check_modules(PC_ICU_PRIVATE_VAR_NS "icu-${${ICU_PRIVATE_VAR_NS}_COMPONENT}" QUIET)
+
+            if(${PC_ICU_PRIVATE_VAR_NS}_FOUND)
+                foreach(${PC_ICU_PRIVATE_VAR_NS}_LIBRARY ${PC_ICU_LIBRARIES})
+                    string(REGEX REPLACE "^icu" "" ${PC_ICU_PRIVATE_VAR_NS}_STRIPPED_LIBRARY ${${PC_ICU_PRIVATE_VAR_NS}_LIBRARY})
+                    list(APPEND ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS ${${PC_ICU_PRIVATE_VAR_NS}_STRIPPED_LIBRARY})
+                endforeach(${PC_ICU_PRIVATE_VAR_NS}_LIBRARY)
+            endif(${PC_ICU_PRIVATE_VAR_NS}_FOUND)
+        endforeach(${ICU_PRIVATE_VAR_NS}_COMPONENT)
+        list(REMOVE_DUPLICATES ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS)
+    endif(PKG_CONFIG_FOUND)
+
+    # Check libraries
+    foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS})
+        set(${ICU_PRIVATE_VAR_NS}_POSSIBLE_RELEASE_NAMES )
+        set(${ICU_PRIVATE_VAR_NS}_POSSIBLE_DEBUG_NAMES )
+        foreach(${ICU_PRIVATE_VAR_NS}_BASE_NAME ${${ICU_PRIVATE_VAR_NS}_COMPONENTS_${${ICU_PRIVATE_VAR_NS}_COMPONENT}})
+            list(APPEND ${ICU_PRIVATE_VAR_NS}_POSSIBLE_RELEASE_NAMES "${${ICU_PRIVATE_VAR_NS}_BASE_NAME}")
+            list(APPEND ${ICU_PRIVATE_VAR_NS}_POSSIBLE_DEBUG_NAMES "${${ICU_PRIVATE_VAR_NS}_BASE_NAME}d")
+            list(APPEND ${ICU_PRIVATE_VAR_NS}_POSSIBLE_RELEASE_NAMES "${${ICU_PRIVATE_VAR_NS}_BASE_NAME}${ICU_MAJOR_VERSION}${ICU_MINOR_VERSION}")
+            list(APPEND ${ICU_PRIVATE_VAR_NS}_POSSIBLE_DEBUG_NAMES "${${ICU_PRIVATE_VAR_NS}_BASE_NAME}${ICU_MAJOR_VERSION}${ICU_MINOR_VERSION}d")
+        endforeach(${ICU_PRIVATE_VAR_NS}_BASE_NAME)
+
+        find_library(
+            ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT}
+            NAMES ${${ICU_PRIVATE_VAR_NS}_POSSIBLE_RELEASE_NAMES}
+            HINTS ${${ICU_PRIVATE_VAR_NS}_ROOT}
+            PATH_SUFFIXES ${_ICU_LIB_SUFFIXES}
+            DOC "Release libraries for ICU"
+        )
+        find_library(
+            ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}
+            NAMES ${${ICU_PRIVATE_VAR_NS}_POSSIBLE_DEBUG_NAMES}
+            HINTS ${${ICU_PRIVATE_VAR_NS}_ROOT}
+            PATH_SUFFIXES ${_ICU_LIB_SUFFIXES}
+            DOC "Debug libraries for ICU"
+        )
+
+        string(TOUPPER "${${ICU_PRIVATE_VAR_NS}_COMPONENT}" ${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT)
+        if(NOT ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT} AND NOT ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}) # both not found
+            set("${ICU_PUBLIC_VAR_NS}_${${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT}_FOUND" FALSE)
+            set("${ICU_PUBLIC_VAR_NS}_FOUND" FALSE)
+        else(NOT ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT} AND NOT ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}) # one or both found
+            set("${ICU_PUBLIC_VAR_NS}_${${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT}_FOUND" TRUE)
+            if(NOT ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT}) # release not found => we are in debug
+                set(${ICU_PRIVATE_VAR_NS}_LIB_${${ICU_PRIVATE_VAR_NS}_COMPONENT} "${${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}}")
+            elseif(NOT ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}) # debug not found => we are in release
+                set(${ICU_PRIVATE_VAR_NS}_LIB_${${ICU_PRIVATE_VAR_NS}_COMPONENT} "${${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT}}")
+            else() # both found
+                set(
+                    ${ICU_PRIVATE_VAR_NS}_LIB_${${ICU_PRIVATE_VAR_NS}_COMPONENT}
+                    optimized ${${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT}}
+                    debug ${${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}}
+                )
+            endif()
+            list(APPEND ${ICU_PUBLIC_VAR_NS}_LIBRARIES ${${ICU_PRIVATE_VAR_NS}_LIB_${${ICU_PRIVATE_VAR_NS}_COMPONENT}})
+        endif(NOT ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT} AND NOT ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT})
+    endforeach(${ICU_PRIVATE_VAR_NS}_COMPONENT)
+
+    # Try to find out compiler flags
+    find_program(${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE icu-config HINTS ${${ICU_PRIVATE_VAR_NS}_ROOT})
+    if(${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cflags OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_C_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cxxflags OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cppflags OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cflags-dynamic OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_C_SHARED_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cxxflags-dynamic OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_CXX_SHARED_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cppflags-dynamic OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_CPP_SHARED_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif(${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE)
+
+    # Check find_package arguments
+    include(FindPackageHandleStandardArgs)
+    if(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+        find_package_handle_standard_args(
+            ${ICU_PUBLIC_VAR_NS}
+            REQUIRED_VARS ${ICU_PUBLIC_VAR_NS}_LIBRARIES ${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS
+            VERSION_VAR ${ICU_PUBLIC_VAR_NS}_VERSION
+        )
+    else(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+        find_package_handle_standard_args(${ICU_PUBLIC_VAR_NS} "ICU not found" ${ICU_PUBLIC_VAR_NS}_LIBRARIES ${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS)
+    endif(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+else(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS)
+    if(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+        message(FATAL_ERROR "Could not find ICU include directory")
+    endif(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+endif(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS)
+
+mark_as_advanced(
+    ${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS
+    ${ICU_PUBLIC_VAR_NS}_LIBRARIES
+)
+
+# IN (args)
+icudebug("FIND_COMPONENTS")
+icudebug("FIND_REQUIRED")
+icudebug("FIND_QUIETLY")
+icudebug("FIND_VERSION")
+# OUT
+# Found
+icudebug("FOUND")
+icudebug("UC_FOUND")
+icudebug("I18N_FOUND")
+icudebug("IO_FOUND")
+icudebug("LE_FOUND")
+icudebug("LX_FOUND")
+icudebug("DATA_FOUND")
+# Flags
+icudebug("C_FLAGS")
+icudebug("CPP_FLAGS")
+icudebug("CXX_FLAGS")
+icudebug("C_SHARED_FLAGS")
+icudebug("CPP_SHARED_FLAGS")
+icudebug("CXX_SHARED_FLAGS")
+# Linking
+icudebug("INCLUDE_DIRS")
+icudebug("LIBRARIES")
+# Version
+icudebug("MAJOR_VERSION")
+icudebug("MINOR_VERSION")
+icudebug("PATCH_VERSION")
+icudebug("VERSION")

=== modified file 'cmake/WlFunctions.cmake'
--- cmake/WlFunctions.cmake	2014-12-27 09:46:38 +0000
+++ cmake/WlFunctions.cmake	2015-08-01 06:21:02 +0000
@@ -15,6 +15,7 @@
     USES_SDL2_NET
     USES_SDL2_TTF
     USES_ZLIB
+    USES_ICU
   )
   set(ONE_VALUE_ARG )
   set(MULTI_VALUE_ARGS SRCS DEPENDS)
@@ -142,6 +143,11 @@
     target_link_libraries(${NAME} ${Boost_LIBRARIES})
   endif()
 
+  if(ARG_USES_ICU)
+    wl_include_system_directories(${NAME} ${ICU_INCLUDE_DIRS})
+    target_link_libraries(${NAME} ${ICU_LIBRARIES})
+  endif()
+
   foreach(DEPENDENCY ${ARG_DEPENDS})
     target_link_libraries(${NAME} ${DEPENDENCY})
   endforeach(DEPENDENCY)

=== modified file 'doc/sphinx/source/wlrichtext.rst'
--- doc/sphinx/source/wlrichtext.rst	2014-12-20 18:39:44 +0000
+++ doc/sphinx/source/wlrichtext.rst	2015-08-01 06:21:02 +0000
@@ -1,6 +1,8 @@
 The Widelands Rich Text System
 ==============================
 
+NOCOM(#gunchleoc): Update this documentation when we're finished.
+
 All texts that can be displayed to the user can be formatted to be layouted
 and nicely formatted. This allows for changing of font sizes, weights, colors
 and for the embedding of images. This documents how to format a string to be
@@ -24,7 +26,7 @@
 Starts or ends a rich text. Must be the first tag to appear in the string.
 A full example would be::
 
-   <rt image=map:khanktrukh.png><p line-spacing=3 font-size=12>Hello<br>World</p></rt>
+   <rt image=map:khanktrukh.png><p line-spacing=3 font-size=12>Hello World</p></rt>
 
 This would instruct widelands to use the image of Khankruth that comes with
 the map, left align it. To the right of it there would be two lines of text.
@@ -84,11 +86,7 @@
 line-spacing
    Line spacing in points. Default is 0.
 
-``<br>``
-^^^^^^^^
 
-This inserts a line break into the text. The line break character (``\n``) is
-ignored inside a rich text.
 
 Real world Lua example
 ----------------------
@@ -105,7 +103,7 @@
       "<p font-weight=bold font-decoration=underline font-style=italic font-size=24>" ..
          "YOU so rock dude!" ..
       "</p></rt>" ..
-      "<rt><p>No. I really mean this.<br><br>Seriously.</p></rt>",
+      "<rt><p>No. I really mean this. Seriously.</p></rt>",
       { popup = true }
    )
 

=== modified file 'i18n/fonts.lua'
--- i18n/fonts.lua	2015-01-31 07:09:50 +0000
+++ i18n/fonts.lua	2015-08-01 06:21:02 +0000
@@ -2,23 +2,21 @@
 --
 -- Define which fontset you wish to use for your language in locales.lua.
 --
--- The "default" font set covers all possible font styles.
---
--- Your font might not have all of these available. In this case, it is
--- sufficient to define "serif" at the least, a fallback scheme is in place.
--- But do define everything your fontset has.
---
 -- When adding a new fontset, also make sure you have all pertinent license
 -- and source information collected in its folder.
 
 
 return {
-   -- This is the default set and always needs to be complete.
+   -- This is the default set and always needs to be complete. It covers all possible font styles.
 	default = {
+		-- If your language doesn't distinguish between serif and sans serif fonts, please use the serif set.
+		 -- Your font set should always define "serif".
 		serif = "DejaVu/DejaVuSerif.ttf",
+		 -- Add bold and italic variants if your font set has them.
 		serif_bold = "DejaVu/DejaVuSerif-Bold.ttf",
 		serif_italic = "DejaVu/DejaVuSerif-Italic.ttf",
 		serif_bold_italic = "DejaVu/DejaVuSerif-BoldItalic.ttf",
+		-- If your font set doesn't have sans or condensed variants, serif will be used instead.
 		sans = "DejaVu/DejaVuSans.ttf",
 		sans_bold = "DejaVu/DejaVuSans-Bold.ttf",
 		sans_italic = "DejaVu/DejaVuSans-Oblique.ttf",
@@ -27,12 +25,21 @@
 		condensed_bold = "DejaVu/DejaVuSansCondensed-Bold.ttf",
 		condensed_italic = "DejaVu/DejaVuSansCondensed-Oblique.ttf",
 		condensed_bold_italic = "DejaVu/DejaVuSansCondensed-BoldOblique.ttf",
-		direction = "ltr"
+		-- If the diection isn't defined, your font set will default to "ltr" = left-to-right.
+		-- For right-to-left or bidirectional (BiDi) languages, use "rtl".
+		direction = "ltr",
+		-- size_offset is added to font sizes to make up for fonts that are too small.
+		-- Use negative values if the font is too big.
+		size_offset = 0
 	},
 
 	arabic = {
-		serif = "FaKacstBook/FaKacstBook.ttf",
-		direction = "rtl"
+		serif = "amiri/amiri-regular.ttf",
+		serif_bold = "amiri/amiri-bold.ttf",
+		serif_italic = "amiri/amiri-slanted.ttf",
+		serif_bold_italic = "amiri/amiri-boldslanted.ttf",
+		direction = "rtl",
+		size_offset = 4
 	},
 
 	cjk = {

=== removed directory 'i18n/fonts/FaKacstBook'
=== removed file 'i18n/fonts/FaKacstBook/FaKacstBook.ttf'
Binary files i18n/fonts/FaKacstBook/FaKacstBook.ttf	2014-10-14 12:53:01 +0000 and i18n/fonts/FaKacstBook/FaKacstBook.ttf	1970-01-01 00:00:00 +0000 differ
=== removed file 'i18n/fonts/FaKacstBook/README'
--- i18n/fonts/FaKacstBook/README	2014-10-14 12:53:01 +0000
+++ i18n/fonts/FaKacstBook/README	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-Downloaded from Persianize Free(GPL'ed) Arabic Fonts
-
-https://launchpad.net/cgaf
-
-Maintainer: Saeed Rasooli [e-mail]

=== added directory 'i18n/fonts/amiri'
=== added file 'i18n/fonts/amiri/OFL-FAQ.txt'
--- i18n/fonts/amiri/OFL-FAQ.txt	1970-01-01 00:00:00 +0000
+++ i18n/fonts/amiri/OFL-FAQ.txt	2015-08-01 06:21:02 +0000
@@ -0,0 +1,369 @@
+OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL)
+Version 1.1-update2 - 23 August 2010
+(See http://scripts.sil.org/OFL for updates)
+
+
+CONTENTS OF THIS FAQ
+1  USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
+2  USING OFL FONTS FOR WEB PAGES AND ONLINE WEBFONT SERVICES
+3  MODIFYING OFL-LICENSED FONTS
+4  LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
+5  CHOOSING RESERVED FONT NAMES
+6  ABOUT THE FONTLOG
+7  MAKING CONTRIBUTIONS TO OFL PROJECTS
+8  ABOUT THE LICENSE ITSELF
+9  ABOUT SIL INTERNATIONAL
+APPENDIX A - FONTLOG EXAMPLE
+
+
+1  USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
+
+1.1  Can I use the fonts for a book or other print publication?
+Yes. You can mention the font and author in the book's colophon if you wish, but that is not required.
+
+1.2  Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions?
+Yes! Fonts licensed under the OFL can be freely included alongside other software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are typically aggregated with, not merged into, existing software, there is little need to be concerned about incompatibility with existing software licenses. You may also repackage the fonts and the accompanying components in a .rpm or .deb package and include them in distribution CD/DVDs and online repositories. (Also see section 5.9 about rebuilding from source.)
+
+1.3  I want to distribute the fonts with my program. Does this mean my program also has to be Free/Libre and Open Source Software?
+No. Only the portions based on the Font Software are required to be released under the OFL. The intent of the license is to allow aggregation or bundling with software under restricted licensing as well.
+
+1.4  Can I sell a software package that includes these fonts?
+Yes, you can do this with both the Original Version and a Modified Version of the fonts. Examples of bundling made possible by the OFL would include: word processors, design and publishing applications, training and educational software, games and entertainment software, mobile device applications, etc.
+
+1.5  Can I include the fonts on a CD of freeware or commercial fonts?
+Yes, as long some other font or software is also on the disk, so the OFL font is not sold by itself.
+
+1.6  Why won't the OFL let me sell the fonts alone?
+The intent is to keep people from making money by simply redistributing the fonts. The only people who ought to profit directly from the fonts should be the original authors, and those authors have kindly given up potential direct income to distribute their fonts under the OFL. Please honour and respect their contribution!
+
+1.7  What about sharing OFL fonts with friends on a CD, DVD or USB stick?
+You are very welcome to share open fonts with friends, family and colleagues through removable media. Just remember to include the full font package, including any copyright notices and licensing information as available in OFL.txt. In the case where you sell the font, it has to come bundled with software.
+
+1.8  Can I host the fonts on a web site for others to use?
+Yes, as long as you make the full font package available. In most cases it may be best to point users to the main site that distributes the Original Version so they always get the most recent stable and complete version. See also discussion of webfonts in Section 2.
+
+1.9  Can I host the fonts on a server for use over our internal network?
+Yes. If the fonts are transferred from the server to the client computer by means that allow them to be used even if the computer is no longer attached to the network, the full package (copyright notices, licensing information, etc.) should be included.
+
+1.10  Does the full OFL license text always need to accompany the font?
+The only situation in which an OFL font can be distributed without the text of the OFL (either in a separate file or in font metadata), is when a font is embedded in a document or bundled within a program. In the case of metadata included within a font, it is legally sufficient to include only a link to the text of the OFL on http://scripts.sil.org/OFL, but we strongly recommend against this. Most modern font formats include metadata fields that will accept the full OFL text, and full inclusion increases the likelihood that users will understand and properly apply the license.
+
+1.11  What do you mean by 'embedding'? How does that differ from other means of distribution?
+By 'embedding' we mean inclusion of the font in a document or file in a way that makes extraction (and redistribution) difficult or clearly discouraged. In many cases the names of embedded fonts might also not be obvious to those reading the document, the font data format might be altered, and only a subset of the font - only the glyphs required for the text - might be included. Any other means of delivering a font to another person is considered 'distribution', and needs to be accompanied by any copyright notices and licensing information available in OFL.txt.
+
+1.12  So can I embed OFL fonts in my document?
+Yes, either in full or a subset. The restrictions regarding font modification and redistribution do not apply, as the font is not intended for use outside the document.
+
+1.13  Does embedding alter the license of the document itself?
+No. Referencing or embedding an OFL font in any document does not change the license of the document itself. The requirement for fonts to remain under the OFL does not apply to any document created using the fonts and their derivatives. Similarly, creating any kind of graphic using a font under OFL does not make the resulting artwork subject to the OFL.
+
+1.14  If OFL fonts are extracted from a document in which they are embedded (such as a PDF file), what can be done with them? Is this a risk to author(s)?
+The few utilities that can extract fonts embedded in a PDF will typically output limited amounts of outlines - not a complete font. To create a working font from this method is much more difficult and time consuming than finding the source of the original OFL font. So there is little chance that an OFL font would be extracted and redistributed inappropriately through this method. Even so, copyright laws address any misrepresentation of authorship. All Font Software released under the OFL and marked as such by the author(s) is intended to remain under this license regardless of the distribution method, and cannot be redistributed under any other license. We strongly discourage any font extraction - we recommend directly using the font sources instead - but if you extract font outlines from a document, please be considerate: use your common sense and respect the work of the author(s) and the licensing model.
+
+1.15  What about distributing fonts with a document? Within a compressed folder structure? Is it distribution, bundling or embedding?
+Certain document formats may allow the inclusion of an unmodified font within their file structure which consists of a compressed folder containing the various resources forming the document (such as pictures and thumbnails). Including fonts within such a structure is understood as being different from embedding but rather similar to bundling (or mere aggregation) which the license explicitly allows. In this case the font is conveyed unchanged whereas embedding a font usually transforms it from the original format. The OFL does not allow anyone to extract the font from such a structure to then redistribute it under another license. The explicit permission to redistribute and embed does not cancel the requirement for the Font Software to remain under the license chosen by its author(s).
+
+1.16  What about ebooks shipping with open fonts?
+The requirements differ depending on whether the fonts are linked, embedded or distributed (bundled or aggregated). Some ebook formats use web technologies to do font linking via @font-face, others are designed for font embedding, some use fonts distributed with the document or reading software, and a few rely solely on the fonts already present on the target system. The license requirements depend on the type of inclusion as discussed in 1.15.
+
+1.17  Can Font Software released under the OFL be subject to URL-based access restrictions methods or DRM (Digital Rights Management) mechanisms?
+Yes, but these issues are out-of-scope for the OFL. The license itself neither encourages their use nor prohibits them since such mechanisms are not implemented in the components of the Font Software but through external software. Such restrictions are put in place for many different purposes corresponding to various usage scenarios. One common example is to limit potentially dangerous cross-site scripting attacks. However, in the spirit of libre/open fonts and unrestricted writing systems, we strongly encourage open sharing and reuse of OFL fonts, and the establishment of an environment where such restrictions are unnecessary. Note that whether you wish to use such mechanisms or you prefer not to, you must still abide by the rules set forth by the OFL when using fonts released by their authors under this license. Derivative fonts must be licensed under the OFL, even if they are part of a service for which you charge fees and/or for which access to source code is restricted. You may not sell the fonts on their own - they must be part of a larger software package, bundle or subscription plan. For example, even if the OFL font is distributed in a software package or via an online service using a DRM mechanism, the user would still have the right to extract that font, use, study, modify and redistribute it under the OFL.
+
+1.18  I've come across a font released under the OFL. How can I easily get more information about the Original Version? How can I know where it stands compared to the Original Version or other Modified Versions?
+Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgement section. Please consider using the Original Versions of the fonts whenever possible.
+
+1.19  What do you mean in condition 4? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement?
+The intent is that the goodwill and reputation of the author(s) should not be used in a way that makes it sound like the original author(s) endorse or approve of a specific Modified Version or software bundle. For example, it would not be right to advertise a word processor by naming the author(s) in a listing of software features, or to promote a Modified Version on a web site by saying "designed by ...". However, it would be appropriate to acknowledge the author(s) if your software package has a list of people who deserve thanks. We realize that this can seem to be a grey area, but the standard used to judge an acknowledgement is that if the acknowledgement benefits the author(s) it is allowed, but if it primarily benefits other parties, or could reflect poorly on the author(s), then it is not.
+
+
+2  USING OFL FONTS FOR WEBPAGES AND ONLINE WEBFONT SERVICES
+
+2.1  Can I make webpages using these fonts?
+Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options: 
+- referring directly in your stylesheet to open fonts which may be available on the user's system
+- providing links to download the full package of the font - either from your own website or from elsewhere - so users can install it themselves
+- using @font-face to distribute the font directly to browsers. This is recommended and explicitly allowed by the licensing model because it is distribution. The font file itself is distributed with other components of the webpage. It is not embedded in the webpage but referenced through a web address which will cause the browser to retrieve and use the corresponding font to render the webpage (see 1.11 and 1.15 for details related to embedding fonts into documents). As you take advantage of the @font-face cross-platform standard, be aware that webfonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using webfonts are to allow design of dynamic text elements instead of static graphics, to make it easier for content to be localized and translated, indexed and searched, and all this with cross-platform open standards without depending on restricted extensions or plugins. You should check the CSS cascade (the order in which fonts are being called or delivered to your users) when testing.
+
+2.2  Can I make and use WOFF (Web Open Font Format) versions of OFL fonts?
+Yes, but you need to be careful. A change in font format normally is considered modification, and Reserved Font Names (RFNs) cannot be used. Because of the design of the WOFF format, however, it is possible to create a WOFF version that is not considered modification, and so would not require a name change. You are allowed to create, use and distribute a WOFF version of an OFL font without changing the font name, but only if:
+
+- the original font data remains unchanged except for WOFF compression, and
+- WOFF-specific metadata is either omitted altogether or present and includes, unaltered, the contents of all equivalent metadata in the original font.
+
+If the original font data or metadata is changed, or the WOFF-specific metadata is incomplete, the font must be considered a Modified Version, the OFL restrictions would apply and the name of the font must be changed: any RFNs cannot be used and copyright notices and licensing information must be included and cannot be deleted or modified. You must come up with a unique name - we recommend one corresponding to your domain or your particular web application. Be aware that only the original author(s) can use RFNs. This is to prevent collisions between a derivative tuned to your audience and the original upstream version and so to reduce confusion.
+
+Please note that most WOFF conversion tools and online services do not meet the two requirements listed above, and so their output must be considered a Modified Version. So be very careful and check to be sure that the tool or service you're using is compressing unchanged data and completely and accurately reflecting the original font metadata.
+
+2.3  What about other webfont formats such as EOT/EOTLite/CWT/etc.?
+In most cases these formats alter the original font data more than WOFF, and do not completely support appropriate metadata, so their use must be considered modification and RFNs may not be used.
+
+2.4  Can I make OFL fonts available through webfont online services?
+Yes, you are welcome to include OFL fonts in online webfont services as long as you properly meet all the conditions of the license. The origin and open status of the font should be clear among the other fonts you are hosting. Authorship, copyright notices and license information must be sufficiently visible to your users or subscribers so they know where the font comes from and the rights granted by the author(s). Make sure the font file contains the needed copyright notice(s) and licensing information in its metadata. Please double-check the accuracy of every field to prevent contradictory information. Other font formats, including EOT/EOTLite/CWT and superior alternatives like WOFF, already provide fields for this information. Remember that if you modify the font within your library or convert it to another format for any reason the OFL restrictions apply and you need to change the names accordingly. Please respect the author's wishes as expressed in the OFL and do not misrepresent original designers and their work. Don't lump quality open fonts together with dubious freeware or public domain fonts. Consider how you can best work with the original designers and foundries, support their efforts and generate goodwill that will benefit your service. (See 1.17 for details related to URL-based access restrictions methods or DRM mechanisms).
+
+2.5  Can I make and publish CMS themes or templates that use OFL fonts?  Can I include the fonts themselves in the themes or templates? Can I sell the whole package?
+Yes, you are very welcome to integrate open fonts into themes and templates for your preferred CMS and make them more widely available. Be aware that you can only sell the fonts and your CMS add-on as part of a software bundle. (See 1.4 for details and examples about selling bundles). 
+
+2.6  Some webfont formats and services provide ways of "optimising" the font for a particular website or web application; is that allowed? 
+Yes, it is permitted, but remember that these optimised versions are Modified Versions and so must follow OFL requirements like appropriate renaming. Also you need to bear in mind the other important parameters beyond compression, speed and responsiveness: you need to consider the audience of your particular website or web application, as choosing some optimisation parameters may turn out to be less than ideal for them. Subsetting by removing certain glyphs or features may seriously limit functionality of the font in various languages used by your users. It may also introduce degradation of quality in the rendering or specific bugs on the various platforms compared to the original font. In other words, remember that one person's optimised font may be another person's missing feature. Various advanced typographic features are also available through CSS and may provide the desired effects without the need to modify the font.
+
+
+3  MODIFYING OFL-LICENSED FONTS
+
+3.1  Can I change the fonts? Are there any limitations to what things I can and cannot change?
+You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could put additional information into it that covers your contribution.
+
+3.2  I have a font that needs a few extra glyphs - can I take them from an OFL licensed font and copy them into mine?
+Yes, but if you distribute that font to others it must be under the OFL, and include the information mentioned in condition 2 of the license.
+
+3.3  Can I charge people for my additional work? In other words, if I add a bunch of special glyphs and/or OpenType/Graphite code, can I sell the enhanced font?
+Not by itself. Derivative fonts must be released under the OFL and cannot be sold by themselves. It is permitted, however, to include them in a larger software package (such as text editors, office suites or operating systems), even if the larger package is sold. In that case, you are strongly encouraged, but not required, to also make that derived font easily and freely available outside of the larger package.
+
+3.4  Can I pay someone to enhance the fonts for my use and distribution?
+Yes. This is a good way to fund the further development of the fonts. Keep in mind, however, that if the font is distributed to others it must be under the OFL. You won't be able to recover your investment by exclusively selling the font, but you will be making a valuable contribution to the community. Please remember how you have benefited from the contributions of others.
+
+3.5  I need to make substantial revisions to the font to make it work with my program. It will be a lot of work, and a big investment, and I want to be sure that it can only be distributed with my program. Can I restrict its use?
+No. If you redistribute a Modified Version of the font it must be under the OFL. You may not restrict it in any way beyond what the OFL permits and requires. This is intended to ensure that all released improvements to the fonts become available to everyone. But you will likely get an edge over competitors by being the first to distribute a bundle with the enhancements. Again, please remember how you have benefited from the contributions of others.
+
+3.6  Do I have to make any derivative fonts (including extended source files, build scripts, documentation, etc.) publicly available?
+No, but please consider sharing your improvements with others. You may find that you receive in return more than what you gave.
+
+3.7  If a trademark is claimed in the OFL font, does that trademark need to remain in modified fonts?
+Yes, any trademark notices must remain in any derivative fonts to respect trademark laws, but you may add any additional trademarks you claim, officially registered or not. For example if an OFL font called "Foo" contains a notice that "Foo is a trademark of Acme", then if you rename the font to "Bar" when creating a Modified Version, the new trademark notice could say "Foo is a trademark of Acme Inc. - Bar is a trademark of Roadrunner Technologies Ltd.". Trademarks work alongside the OFL and are not subject to the terms of the licensing agreement. Please refer to the appropriate trademark laws.
+
+
+4  LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
+
+4.1  Can I use the SIL OFL for my own fonts?
+Yes! We heartily encourage everyone to use the OFL to distribute their own original fonts. It is a carefully constructed license that allows great freedom along with enough artistic integrity protection for the work of the authors as well as clear rules for other contributors and those who redistribute the fonts. The licensing model is used successfully by various organisations, both for-profit and not-for-profit, to release fonts of varying levels of scope and complexity.
+
+4.2  What do I have to do to apply the OFL to my font?
+If you want to release your fonts under the OFL, we recommend you do the following:
+
+4.2.1  Put your copyright and Reserved Font Names information at the beginning of the main OFL.txt file in place of the dedicated placeholders. Include this file in your release package.
+
+4.2.2  Put your copyright and the OFL text with Reserved Font Names into your font files (the copyright and license fields). A link to the OFL text on the OFL web site is an acceptable (but not recommended) alternative. Also add this information to any other components (build scripts, glyph databases, documentation, test files, etc). Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata.
+
+4.2.3  Write an initial FONTLOG.txt for your font and include it in the release package.
+
+4.2.4  Include the relevant practical documentation on the license by including the OFL-FAQ.txt in your package.
+
+4.3  Will you make my font OFL for me?
+We won't do the work for you. We can, however, try to answer your questions, unfortunately we do not have the resources to review and check your font packages for correct use of the OFL.
+
+4.4  Will you distribute my OFL font for me?
+No, although if the font is of sufficient quality and general interest we may include a link to it on our partial list of OFL fonts on the OFL web site. You may wish to consider other open font catalogs or hosting services, such as the Unifont Font Guide (http://unifont.org/fontguide), The League of Movable Type (http://theleagueofmovabletype.com), Kernest (http://kernest.com/) or the Open Font Library (http://openfontlibrary.org/), which despite the name has no direct relationship to the OFL or SIL. We do not endorse any particular catalog or hosting service - it is your responsibility to determine if the service is right for you.
+
+4.5  Why should I use the OFL for my fonts?
+- to meet needs for fonts that can be modified to support minority languages
+- to provide a legal and clear way for people to respect your work but still use it (and reduce piracy)
+- to involve others in your font project
+- to enable your fonts to be expanded with new weights and improved writing system/language support
+- to allow more technical font developers to add features to your design (such as OpenType and Graphite support)
+- to renew the life of an old font lying on your hard drive with no business model
+- to allow your font to be included in Libre Software operating systems like Ubuntu
+- to give your font world status and wide, unrestricted distribution
+- to educate students about quality typeface and font design
+- to expand your test base and get more useful feedback 
+- to extend your reach to new markets when users see your metadata and go to your website
+- to get your font more easily into one of the webfont online services
+- to attract attention for your commercial fonts
+- to make money through webfont services
+- to make money by bundling fonts with applications
+- to make money adjusting and extending existing open fonts
+- to get a better chance that foundations/NGOs/charities/companies who commission fonts will pick you 
+- to be part of a sharing design and development community 
+- to give back and contribute to a growing body of font sources
+
+
+5  CHOOSING RESERVED FONT NAMES
+
+5.1  What are Reserved Font Names?
+These are font names, or portions of font names, that the author has chosen to reserve for use only with the Original Version of the font, or for Modified Version(s) created by the original author.
+
+5.2  Why can't I use the Reserved Font Names in my derivative font names? I'd like people to know where the design came from.
+The best way to acknowledge the source of the design is to thank the original authors and any other contributors in the files that are distributed with your revised font (although no acknowledgement is required). The FONTLOG is a natural place to do this. Reserved Font Names ensure that the only fonts that have the original names are the unmodified Original Versions. This allows designers to maintain artistic integrity while allowing collaboration to happen. It eliminates potential confusion and name conflicts. When choosing a name, be creative and avoid names that reuse almost all the same letters in the same order or sound like the original. It will help everyone if Original Versions and Modified Versions can easily be distinguished from one another and from other derivatives. Any substitution and matching mechanism is outside the scope of the license.
+
+5.3  What do you mean by "primary name as presented to the user"? Are you referring to the font menu name?
+Yes, this applies to the font menu name and other mechanisms that specify a font in a document. It would be fine, however, to keep a text reference to the original fonts in the description field, in your modified source file or in documentation provided alongside your derivative as long as no one could be confused that your modified source is the original. But you cannot use the Reserved Font Names in any way to identify the font to the user (unless the Copyright Holder(s) allow(s) it through a separate agreement). Users who install derivatives (Modified Versions) on their systems should not see any of the original Reserved Font Names in their font menus, for example. Again, this is to ensure that users are not confused and do not mistake one font for another and so expect features only another derivative or the Original Version can actually offer. 
+
+5.4  Am I not allowed to use any part of the Reserved Font Names?
+You may not use individual words from the Reserved Font Names, but you would be allowed to use parts of words, as long as you do not use any word from the Reserved Font Names entirely. We do not recommend using parts of words because of potential confusion, but it is allowed. For example, if "Foobar" was a Reserved Font Name, you would be allowed to use "Foo" or "bar", although we would not recommend it. Such an unfortunate choice would confuse the users of your fonts as well as make it harder for other designers to contribute.
+
+5.5  So what should I, as an author, identify as Reserved Font Names?
+Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". You also need to be very careful about reserving font names which are already linked to trademarks (whether registered or not) which you do not own.
+
+5.6  Do I, as an author, have to identify any Reserved Font Names?
+No, but we strongly encourage you to do so. This is to avoid confusion between your work and Modified Versions.
+
+5.7  Are any names (such as the main font name) reserved by default?
+No. That is a change to the license as of version 1.1. If you want any names to be Reserved Font Names, they must be specified after the copyright statement(s).
+
+5.8  Is there any situation in which I can use Reserved Font Names for a Modified Version?
+The Copyright Holder(s) can give certain trusted parties the right to use any of the Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion.
+
+5.9  Do font rebuilds require a name change? Do I have to change the name of the font when my packaging workflow includes a full rebuild from source?
+Yes, all rebuilds which change the font data and the smart code are Modified Versions and the requirements of the OFL apply: you need to respect what the Author(s) have chosen in terms of Reserved Font Names. However if a package (or installer) is simply a wrapper or a compressed structure around the final font - leaving them intact on the inside - then no name change is required. Please get in touch with the author(s) and copyright holder(s) to inquire about the presence of font sources beyond the final font file(s) and the recommended build path. That build path may very well be non-trivial and hard to reproduce accurately by the maintainer. If a full font build path is made available by the upstream author(s) please be aware that any regressions and changes you may introduce when doing a rebuild for packaging purposes is your responsibility as a package maintainer since you are effectively creating a separate branch. You should make it very clear to your users that your rebuilt version is not the canonical one from upstream.
+
+5.10  Can I add other Reserved Font Names when making a derivative font?
+Yes. List your additional Reserved Font Names after your additional copyright statement, as indicated with example placeholders at the top of the OFL.txt file. Be sure you do not remove any exiting RFNs but only add your own.
+
+
+6  ABOUT THE FONTLOG
+
+6.1  What is this FONTLOG thing exactly?
+It has three purposes: 1) to provide basic information on the font to users and other developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge authors and other contributors. Please use it!
+
+6.2  Is the FONTLOG required?
+It is not a requirement of the license, but we strongly recommend you have one.
+
+6.3  Am I required to update the FONTLOG when making Modified Versions?
+No, but users, designers and other developers might get very frustrated with you if you don't. People need to know how derivative fonts differ from the original, and how to take advantage of the changes, or build on them. There are utilities that can help create and maintain a FONTLOG, such as the FONTLOG support in FontForge.
+
+6.4  What should the FONTLOG look like?
+It is typically a separate text file (FONTLOG.txt), but can take other formats. It commonly includes these four sections:
+
+- brief header describing the FONTLOG itself and name of the font family
+- Basic Font Information - description of the font family, purpose and breadth
+- ChangeLog - chronological listing of changes
+- Acknowledgements - list of authors and contributors with contact information
+
+It could also include other sections, such as: where to find documentation, how to make contributions, information on contributing organizations, source code details, and a short design guide. See Appendix A for an example FONTLOG.
+
+
+7  MAKING CONTRIBUTIONS TO OFL PROJECTS
+
+7.1  Can I contribute work to OFL projects?
+In many cases, yes. It is common for OFL fonts to be developed by a team of people who welcome contributions from the wider community. Contact the original authors for specific information on how to participate in their projects.
+
+7.2  Why should I contribute my changes back to the original authors?
+It would benefit many people if you contributed back in response to what you've received. Your contributions and improvements to the fonts and other components could be a tremendous help and would encourage others to contribute as well and 'give back'. You will then benefit from other people's contributions as well. Sometimes maintaining your own separate version takes more effort than merging back with the original. Be aware that any contributions, however, must be either your own original creation or work that you own, and you may be asked to affirm that clearly when you contribute.
+
+7.3  I've made some very nice improvements to the font. Will you consider adopting them and putting them into future Original Versions?
+Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes - the use of smart source revision control systems like subversion, svk, mercurial, git or bzr is a good idea. Please follow the recommendations given by the author(s) in terms of preferred source formats and configuration parameters for sending contributions. If this is not indicated in a FONTLOG or other documentation of the font, consider asking them directly. Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. Keep in mind that some kinds of changes (esp. hinting) may be technically difficult to integrate.
+
+7.4  How can I financially support the development of OFL fonts?
+It is likely that most authors of OFL fonts would accept financial contributions - contact them for instructions on how to do this. Such contributions would support future development. You can also pay for others to enhance the fonts and contribute the results back to the original authors for inclusion in the Original Version.
+
+
+8  ABOUT THE LICENSE ITSELF
+
+8.1  I see that this is version 1.1 of the license. Will there be later changes?
+Version 1.1 is the first minor revision of the OFL. We are confident that version 1.1 will meet most needs, but are open to future improvements. Any revisions would be for future font releases, and previously existing licenses would remain in effect. No retroactive changes are possible, although the Copyright Holder(s) can re-release the font under a revised OFL. All versions will be available on our web site: http://scripts.sil.org/OFL.
+
+8.2  Does this license restrict the rights of the Copyright Holder(s)?
+No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version. Only the Copyright Holder(s) can do this.
+
+8.3  Is the OFL a contract or a license?
+The OFL is a license and not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license.
+
+8.4  I really like the terms of the OFL, but want to change it a little. Am I allowed to take ideas and actual wording from the OFL and put them into my own custom license for distributing my fonts?
+We strongly recommend against creating your very own unique open licensing model. Using a modified or derivative license will likely cut you off - along with the font(s) under that license - from the community of designers using the OFL, potentially expose you and your users to legal liabilities, and possibly put your work and rights at risk. The OFL went though a community and legal review process that took years of effort, and that review is only applicable to an unmodified OFL. The text of the OFL has been written by SIL (with review and consultation from the community) and is copyright (c) 2005-2010 SIL International. You may re-use the ideas and wording (in part, not in whole) in another non-proprietary license provided that you call your license by another unambiguous name, that you do not use the preamble, that you do not mention SIL and that you clearly present your license as different from the OFL so as not to cause confusion by being too similar to the original. If you feel the OFL does not meet your needs for an open license, please contact us.
+
+8.5  Can I translate the license and the FAQ into other languages?
+SIL certainly recognises the need for people who are not familiar with English to be able to understand the OFL and its use. Making the license very clear and readable has been a key goal for the OFL, but we know that people understand their own language best.
+
+If you are an experienced translator, you are very welcome to translate the OFL and OFL-FAQ so that designers and users in your language community can understand the license better. But only the original English version of the license has legal value and has been approved by the community. Translations do not count as legal substitutes and should only serve as a way to explain the original license. SIL - as the author and steward of the license for the community at large - does not approve any translation of the OFL as legally valid because even small translation ambiguities could be abused and create problems.
+
+SIL gives permission to publish unofficial translations into other languages provided that they comply with the following guidelines:
+
+- Put the following disclaimer in both English and the target language stating clearly that the translation is unofficial:
+
+"This is an unofficial translation of the SIL Open Font License into <language_name>. It was not published by SIL International, and does not legally state the distribution terms for fonts that use the OFL. A release under the OFL is only valid when using the original English text. However, we recognize that this unofficial translation will help users and designers not familiar with English to better understand and use the OFL. We encourage designers who consider releasing their creation under the OFL to read the OFL-FAQ in their own language if it is available. Please go to http://scripts.sil.org/OFL for the official version of the license and the accompanying OFL-FAQ."
+
+- Keep your unofficial translation current and update it at our request if needed, for example if there is any ambiguity which could lead to confusion.  
+
+If you start such a unofficial translation effort of the OFL and OFL-FAQ please let us know.
+
+
+9  ABOUT SIL INTERNATIONAL
+
+9.1  Who is SIL International and what do they do?
+SIL serves language communities worldwide, building their capacity for sustainable language development, by means of research, translation, training and materials development. SIL makes its services available to all without regard to religious belief, political ideology, gender, race, or ethnic background. SIL's members and volunteers share a Christian commitment.
+
+9.2  What does this have to do with font licensing?
+The ability to read, write, type and publish in one's own language is one of the most critical needs for millions of people around the world. This requires fonts that are widely available and support lesser-known languages. SIL develops - and encourages others to develop - a complete stack of writing systems implementation components available under open licenses. This open stack includes input methods, smart fonts, smart rendering libraries and smart applications. There has been a need for a common open license that is specifically applicable to fonts and related software (a crucial component of this stack), so SIL developed the SIL Open Font License with the help of the Free/Libre and Open Source Software community.
+
+9.3  How can I contact SIL?
+Our main web site is: http://www.sil.org/
+Our site about complex scripts is: http://scripts.sil.org/
+Information about this license (and contact information) is at: http://scripts.sil.org/OFL
+
+
+APPENDIX A - FONTLOG EXAMPLE
+
+Here is an example of the recommended format for a FONTLOG, although other formats are allowed.
+
+-----
+FONTLOG for the GlobalFontFamily fonts
+
+This file provides detailed information on the GlobalFontFamily Font Software. This information should be distributed along with the GlobalFontFamily fonts and any derivative works.
+
+Basic Font Information
+
+GlobalFontFamily is a Unicode typeface family that supports all languages that use the Latin script and its variants, and could be expanded to support other scripts.
+
+NewWorldFontFamily is based on the GlobalFontFamily and also supports Greek, Hebrew, Cyrillic and Armenian.
+
+More specifically, this release supports the following Unicode ranges...
+This release contains...
+Documentation can be found at...
+To contribute to the project...
+
+ChangeLog
+
+1 August 2008 (Tom Parker) GlobalFontFamily version 1.2.1
+- Tweaked the smart font code (Branch merged with trunk version)
+- Provided improved build and debugging environment for smart behaviours
+
+7 February 2007 (Pat Johnson) NewWorldFontFamily Version 1.3
+- Added Greek and Cyrillic glyphs
+
+7 March 2006 (Fred Foobar) NewWorldFontFamily Version 1.2
+- Tweaked contextual behaviours
+
+1 Feb 2005 (Jane Doe) NewWorldFontFamily Version 1.1
+- Improved build script performance and verbosity
+- Extended the smart code documentation
+- Corrected minor typos in the documentation
+- Fixed position of combining inverted breve below (U+032F)
+- Added OpenType/Graphite smart code for Armenian
+- Added Armenian glyphs (U+0531 -> U+0587) 
+- Released as "NewWorldFontFamily"
+
+1 Jan 2005 (Joe Smith) GlobalFontFamily Version 1.0
+- Initial release
+
+Acknowledgements
+
+If you make modifications be sure to add your name (N), email (E), web-address (if you have one) (W) and description (D). This list is in alphabetical order.
+
+N: Jane Doe
+E: [e-mail]
+W: http://art.university.edu/projects/fonts
+D: Contributor - Armenian glyphs and code
+
+N: Fred Foobar
+E: [e-mail]
+W: http://foobar.org
+D: Contributor - misc Graphite fixes
+
+N: Pat Johnson
+E: [e-mail]
+W: http://pat.fontstudio.org
+D: Designer - Greek & Cyrillic glyphs based on Roman design
+
+N: Tom Parker
+E: [e-mail]
+W: http://www.company.com/tom/projects/fonts
+D: Engineer - original smart font code
+
+N: Joe Smith
+E: [e-mail]
+W: http://joe.fontstudio.org
+D: Designer - original Roman glyphs
+
+Fontstudio.org is an not-for-profit design group whose purpose is...
+Foobar.org is a distributed community of developers...
+Company.com is a small business who likes to support community designers...
+University.edu is a renowed educational institution with a strong design department...
+-----

=== added file 'i18n/fonts/amiri/OFL.txt'
--- i18n/fonts/amiri/OFL.txt	1970-01-01 00:00:00 +0000
+++ i18n/fonts/amiri/OFL.txt	2015-08-01 06:21:02 +0000
@@ -0,0 +1,87 @@
+Copyright (c) 2010-2013, Khaled Hosny (<[e-mail]>)
+
+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 'i18n/fonts/amiri/README.txt'
--- i18n/fonts/amiri/README.txt	1970-01-01 00:00:00 +0000
+++ i18n/fonts/amiri/README.txt	2015-08-01 06:21:02 +0000
@@ -0,0 +1,8 @@
+designer: Khaled Hosny
+url: http://amirifont.org
+license: OFL
+description: Amiri is a classical Arabic typeface in Naskh style for
+typesetting books and other running text. Its design is a revival of the
+beautiful typeface pioneered in early 20th century by Bulaq Press in Cairo,
+also known as Amiria Press, after which the font is named.
+

=== added file 'i18n/fonts/amiri/amiri-bold.ttf'
Binary files i18n/fonts/amiri/amiri-bold.ttf	1970-01-01 00:00:00 +0000 and i18n/fonts/amiri/amiri-bold.ttf	2015-08-01 06:21:02 +0000 differ
=== added file 'i18n/fonts/amiri/amiri-boldslanted.ttf'
Binary files i18n/fonts/amiri/amiri-boldslanted.ttf	1970-01-01 00:00:00 +0000 and i18n/fonts/amiri/amiri-boldslanted.ttf	2015-08-01 06:21:02 +0000 differ
=== added file 'i18n/fonts/amiri/amiri-regular.ttf'
Binary files i18n/fonts/amiri/amiri-regular.ttf	1970-01-01 00:00:00 +0000 and i18n/fonts/amiri/amiri-regular.ttf	2015-08-01 06:21:02 +0000 differ
=== added file 'i18n/fonts/amiri/amiri-slanted.ttf'
Binary files i18n/fonts/amiri/amiri-slanted.ttf	1970-01-01 00:00:00 +0000 and i18n/fonts/amiri/amiri-slanted.ttf	2015-08-01 06:21:02 +0000 differ
=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/first_island.lua'
--- maps/MP Scenarios/Island Hopping.wmf/scripting/first_island.lua	2014-07-28 11:22:56 +0000
+++ maps/MP Scenarios/Island Hopping.wmf/scripting/first_island.lua	2015-08-01 06:21:02 +0000
@@ -21,10 +21,10 @@
    _nplayers_finished_island[island_idx] = rank
 
    local rewards = _finish_rewards[island_idx][rank]
-   send_to_all(rt(
-      p(msgs_finished_island[rank]:bformat(plr.name, island_idx + 1)) ..
-      p(finished_island_continues:format(format_rewards(rewards)))
-   ))
+   send_to_all(
+      msgs_finished_island[rank]:bformat(plr.name, island_idx + 1) ..
+      finished_island_continues:format(format_rewards(rewards))
+   )
 
    local new_hq = hop_to_next_island(plr, island_idx)
    add_wares(new_hq, rewards)

=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua'
--- maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua	2014-10-02 11:45:56 +0000
+++ maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua	2015-08-01 06:21:02 +0000
@@ -104,7 +104,7 @@
 function format_rewards(r)
    rv = {}
    for name,count in pairs(r) do
-      rv[#rv + 1] = getplural(count, name) .. "<br>\n"
+      rv[#rv + 1] = li(getplural(count, name))
    end
    return table.concat(rv)
 end

=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua	2015-07-26 10:39:48 +0000
+++ maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -1,61 +1,40 @@
 -- =======================================================================
 --                          Texts for this scenario
 -- =======================================================================
-welcome_msg = rt(
+-- NOCOM(#gunchleoc): test when editboxes have been fixed.
+welcome_msg =
    h1(_"Welcome to Island Hopping") ..
    h2(_"Rules") ..
-   p(_(
-[[Island Hopping is a traditional tournament in Atlantean culture. ]] ..
-[[The rules of the game are simple: you start with a headquarters on an island. ]] ..
-[[When you finish a castle at the end of the first island, you are granted a ]] ..
-[[second headquarters on a second island, which will contain all wares from your ]] ..
-[[first headquarters.]]
-)) ..
- p(_(
-[[If you finish a castle in the target area on the second island, you will get ]] ..
-[[a third headquarters on the third island. You must build a castle at ]] ..
-[[the center of the third island and hold it for 20 minutes to win the game.]]
-)) ..
- p(_(
-[[Whenever you finish an island, you will get bonus wares, depending on how many players ]] ..
-[[have finished the island before you. The earlier you finish, the fewer wares you will get. ]] ..
-[[See below for the details.]])) .. p(_(
-[[The point is that the first island only provides stones and wood, the second only meadows and resources. The economies you leave behind will continue to work for you, but you will only reap the benefits at the moment you reach a new island.]])
-) ..
-p(_
-[[Finally, be careful not to waste your quartz and diamonds.]]
-) ..
-h2(_"Finish Rewards") ..
-h3(_"First Island") ..
-h4(_"1st to finish") .. p(format_rewards(_finish_rewards[1][1])) ..
-h4(_"2nd to finish") .. p(format_rewards(_finish_rewards[1][2])) ..
-h4(_"3rd to finish") .. p(format_rewards(_finish_rewards[1][3])) ..
-h4(_"4th to finish") .. p(format_rewards(_finish_rewards[1][4])) ..
-h3(_"Second Island") ..
-h4(_"1st to finish") .. p(format_rewards(_finish_rewards[2][1])) ..
-h4(_"2nd to finish") .. p(format_rewards(_finish_rewards[2][2])) ..
-h4(_"3rd to finish") .. p(format_rewards(_finish_rewards[2][3])) ..
-h4(_"4th to finish") .. p(format_rewards(_finish_rewards[2][4]))
-)
-
+   p(_([[Island Hopping is a traditional tournament in Atlantean culture. The rules of the game are simple: you start with a headquarters on an island. When you finish a castle at the end of the first island, you are granted a second headquarters on a second island, which will contain all wares from your first headquarters.]])) ..
+   p(_([[If you finish a castle in the target area on the second island, you will get a third headquarters on the third island. You must build a castle at the center of the third island and hold it for 20 minutes to win the game.]])) ..
+   p(_([[Whenever you finish an island, you will get bonus wares, depending on how many players have finished the island before you. The earlier you finish, the fewer wares you will get. See below for the details.]])) ..
+   p(_([[The point is that the first island only provides stones and wood, the second only meadows and resources. The economies you leave behind will continue to work for you, but you will only reap the benefits at the moment you reach a new island.]])) ..
+   p(_[[Finally, be careful not to waste your quartz and diamonds.]]) ..
+   h2(_"Finish Rewards") ..
+   h3(_"First Island") ..
+   h4(_"1st to finish") .. p(format_rewards(_finish_rewards[1][1])) ..
+   h4(_"2nd to finish") .. p(format_rewards(_finish_rewards[1][2])) ..
+   h4(_"3rd to finish") .. p(format_rewards(_finish_rewards[1][3])) ..
+   h4(_"4th to finish") .. p(format_rewards(_finish_rewards[1][4])) ..
+   h3(_"Second Island") ..
+   h4(_"1st to finish") .. p(format_rewards(_finish_rewards[2][1])) ..
+   h4(_"2nd to finish") .. p(format_rewards(_finish_rewards[2][2])) ..
+   h4(_"3rd to finish") .. p(format_rewards(_finish_rewards[2][3])) ..
+   h4(_"4th to finish") .. p(format_rewards(_finish_rewards[2][4]))
 
 msgs_finished_island = {
-   _"%1$s was the first to reach Island number %2$i.",
-   _"%1$s was the second to reach Island number %2$i.",
-   _"%1$s was the third to reach Island number %2$i.",
-   _"%1$s was the fourth to reach Island number %2$i."
+   p(_"%1$s was the first to reach Island number %2$i."),
+   p(_"%1$s was the second to reach Island number %2$i."),
+   p(_"%1$s was the third to reach Island number %2$i."),
+   p(_"%1$s was the fourth to reach Island number %2$i.")
 }
-finished_island_continues = _ "The reward for this feat amounts to:" .. "<br>%s"
-
-player_claims_hill = rt(p(_
-[[%s is now King of the Hill and will win the game in 20 minutes, if nobody takes over the hill before then.]]
-))
-lost_control = rt(p(_
-[[%s lost control of the hill.]]
-))
-had_control_for = rt(p(_[[%1$s has been King of the Hill for %2$s!]]))
-player_won = rt(p(_[[%s has won the game. Congratulations!]]))
-
-
-
-
+
+finished_island_continues = p(_"The reward for this feat amounts to:") .. p("%s")
+
+player_claims_hill = p(_[[%s is now King of the Hill and will win the game in 20 minutes, if nobody takes over the hill before then.]])
+
+lost_control = p(_[[%s lost control of the hill.]])
+
+had_control_for = p(_[[%1$s has been King of the Hill for %2$s!]])
+
+player_won = p(_[[%s has won the game. Congratulations!]])

=== modified file 'maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua	2014-10-03 20:16:29 +0000
+++ maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -1,6 +1,7 @@
 -- =======================================================================
 --                          Texts for this scenario
 -- =======================================================================
+-- NOCOM(#gunchleoc): convert when editboxes have been fixed.
 welcome_msg = rt(
    h1(_"Smugglers") ..
    h2(_"Rules") ..

=== modified file 'maps/Plateau.wmf/scripting/texts.lua'
--- maps/Plateau.wmf/scripting/texts.lua	2014-11-03 08:38:48 +0000
+++ maps/Plateau.wmf/scripting/texts.lua	2015-08-01 06:21:02 +0000
@@ -26,7 +26,7 @@
    title = _"Capture the Ancient Castle",
    number = 1,
    body = objective_text(_"Capture the Ancient Castle",
-		listitem_bullet(_[[Defeat Lanissa and capture the ancient castle.]])
+		li(_[[Defeat Lanissa and capture the ancient castle.]])
    ),
 }
 
@@ -35,7 +35,7 @@
    title = _"Defeat Erwyn",
    number = 1,
 	body = objective_text(_"Defeat Erwyn",
-		listitem_bullet(_[[Defeat Erwyn. He commands the strongest opposing military force left on this island.]])
+		li(_[[Defeat Erwyn. He commands the strongest opposing military force left on this island.]])
    ),
 }
 obj_defeat_jomo = {
@@ -43,7 +43,7 @@
    title = _"Defeat Jomo",
    number = 1,
    body = objective_text(_"Defeat Jomo",
-		listitem_bullet(_[[Defeat Jomo. He is taking care of the soldiers’ food supply.]])
+		li(_[[Defeat Jomo. He is taking care of the soldiers’ food supply.]])
 	),
 }
 
@@ -53,11 +53,7 @@
 
 function obj_message(title, text)
    return
-		rt("<p font-size=20 font-weight=bold font-face=serif font-color=3333FF>"
-			..	title ..
-			"</p><p font-size=10> <br></p>"
-			.. p(text)
-			)
+		h1("3333FF", title) .. p(text)
 end
 
 briefing_1_the_forbidden_island = {
@@ -76,8 +72,8 @@
    height = 300,
    posy = 1,
    body = obj_message(_"An Ancient Castle",
-		_([[By the Gods! One of our scouts has discovered a mighty castle at the center of the old plateau. The castle must be quite old and seems to have been built in a foreign style. It’s quite obvious that this is not barbarian craft.]]) .. paragraphdivider() ..
-		_([[Let’s hope that Lanissa – the warlord holding sway over that castle – has not discovered our movements yet. Perhaps we have a chance of conquering that mighty building without a bigger fight! However, it is essential that we capture it. It will be the key to our reign over this island!]]))
+		_([[By the Gods! One of our scouts has discovered a mighty castle at the center of the old plateau. The castle must be quite old and seems to have been built in a foreign style. It’s quite obvious that this is not barbarian craft.]]) ..
+		p(_([[Let’s hope that Lanissa – the warlord holding sway over that castle – has not discovered our movements yet. Perhaps we have a chance of conquering that mighty building without a bigger fight! However, it is essential that we capture it. It will be the key to our reign over this island!]])))
 		.. new_objectives(obj_capture_ancient_castle)
 }
 
@@ -87,8 +83,8 @@
    height = 300,
    posy = 1,
    body = obj_message(_"Ancient Castle Captured",
-		_([[Wonderful! Our troops have finally defeated Lanissa and her soldiers. The ancient castle is ours!]]) .. paragraphdivider() ..
-		_([[It is amazing how far one can see from the highest tower of the castle. We can watch the whole island. So now I wonder why Lanissa did not see us and thus did not prepare. Be that as it may, some things will never come to the light of day. The only important issue at the moment are the opposing troops still left. We have discovered enemy positions held by Erwyn to the north and east of the castle. He is known to be a strong warlord and surely commands the strongest warriors. In the south, we caught sight of some food infrastructures guarded by Jomo – a younger warlord – and we should take care of those infrastructures so we can cut off our enemies’ food supply.]]))
+		_([[Wonderful! Our troops have finally defeated Lanissa and her soldiers. The ancient castle is ours!]]) ..
+		p(_([[It is amazing how far one can see from the highest tower of the castle. We can watch the whole island. So now I wonder why Lanissa did not see us and thus did not prepare. Be that as it may, some things will never come to the light of day. The only important issue at the moment are the opposing troops still left. We have discovered enemy positions held by Erwyn to the north and east of the castle. He is known to be a strong warlord and surely commands the strongest warriors. In the south, we caught sight of some food infrastructures guarded by Jomo – a younger warlord – and we should take care of those infrastructures so we can cut off our enemies’ food supply.]])))
 		.. new_objectives(obj_defeat_erwyn) .. new_objectives(obj_defeat_jomo)
 }
 
@@ -116,6 +112,6 @@
    height = 300,
    posy = 1,
    body = obj_message(_"Victory!",
-		_([[Finally! The island is completely ours. Now we just have to defend it better than the warlords did.]]) .. paragraphdivider() ..
-		_("Congratulations! You have mastered this scenario. You may play on if you like!"))
+		_([[Finally! The island is completely ours. Now we just have to defend it better than the warlords did.]]) ..
+		p(_("Congratulations! You have mastered this scenario. You may play on if you like!")))
 }

=== modified file 'scripting/format_scenario.lua'
--- scripting/format_scenario.lua	2014-11-28 08:45:02 +0000
+++ scripting/format_scenario.lua	2015-08-01 06:21:02 +0000
@@ -18,14 +18,14 @@
 --           return speech("map:princess.png", "2F9131", title, text)
 --        end
 --
---    :arg img: name of the image to use for this speaker
+--    :arg image: name of the image to use for this speaker
 --    :arg clr: a valid 6 char hex color to use for the name of this speaker
 --    :arg title: Title of this text.
 --    :arg text: The text itself. If this is nil, :const:`title` is used as text
 --       instead and there will not be any title.
 --    :returns: the formatted text.
 --
-function speech(img, clr, g_title, g_text)
+function speech(image, clr, g_title, g_text)
    local title, text = g_title, g_text
    if not text then
       title = nil
@@ -37,75 +37,22 @@
 
    local s = ""
    if title then
-      s = rt("<p font-size=20 font-weight=bold font-face=serif " ..
-         ("font-color=%s>"):format(clr) .. title ..
-         "</p><p font-size=8> <br></p>"
-      )
+      s = h1(clr, title)
    end
-
-   return s .. rt(("image=%s"):format(img), p(text))
-end
-
-
--- RST
--- .. function:: listitem(symbol, text)
---
---    Adds the symbol in front of the text to create a list item and adds a paragraphdivider
---
---    :arg symbol: the item symbol for the list, e.g. "•" or "→"
---    :arg text: the text of the list item
---
---    :returns: symbol .. " " .. text .. paragraphdivider()
-function listitem(symbol, text)
-   return symbol .. " " .. text .. listdivider()
-end
-
--- RST
--- .. function:: listitem_bullet(text)
+   return s .. p(img(image) .. text)
+end
+
+
+-- RST
+-- .. function:: li_arrow(text)
 --
 --    Creates a list item with an arrow
 --
 --    :arg text: the text of the list item
 --
---    :returns: listitem("→", text)
-function listitem_arrow(text)
-   return listitem("→", text)
-end
-
--- RST
--- .. function:: listitem_bullet(text)
---
---    Creates a list item with a bullet point
---
---    :arg text: the text of the list item
---
---    :returns: listitem("•", text)
-function listitem_bullet(text)
-   return listitem("•", text)
-end
-
-
--- RST
--- .. function:: listdivider()
---
---    Closes a paragraph and opens a new paragraph.
---    Use this before starting a list when it doesn't create a paragraph.
---    If you want more space, before the list, use paragraphdivider().
---
---    :returns: <br></p><p font-size=4><br></p><p line-spacing=3 font-size=12>
-function listdivider()
-	return ("<br></p><p font-size=4><br></p><p line-spacing=3 font-size=12>")
-end
-
--- RST
--- .. function:: paragraphdivider()
---
---    Closes a paragraph and opens a new paragraph. Use this when you format a string with the speech function
---    and need to divide the speech into multiple paragraphs.
---
---    :returns: <br></p><p font-size=8><br></p><p line-spacing=3 font-size=12>
-function paragraphdivider()
-   return ("<br></p><p font-size=8><br></p><p line-spacing=3 font-size=12>")
+--    :returns: li("→", text)
+function li_arrow(text)
+   return li("→", text)
 end
 
 
@@ -118,7 +65,7 @@
 --       objective text.
 --
 function objective_text(heading, body)
-   return rt(h2(heading) .. p(body))
+   return h2(heading) .. p(body)
 end
 
 
@@ -141,8 +88,5 @@
    	s = s .. obj.body
       sum = sum + obj.number
    end
-   return rt("<p font-size=10> <br></p>" ..
-	   "<p font=serif font-size=18 font-weight=bold font-color=D1D1D1>"
-	   .. ngettext("New Objective", "New Objectives", sum) .. "</p>") .. s
+   return h1(ngettext("New Objective", "New Objectives", sum)) .. s
 end
-

=== modified file 'scripting/formatting.lua'
--- scripting/formatting.lua	2015-05-11 16:49:40 +0000
+++ scripting/formatting.lua	2015-08-01 06:21:02 +0000
@@ -1,3 +1,4 @@
+-- NOCOM(#gunchleoc): Wrap all tags and document allowed attributes when we're done
 -- RST
 -- formatting.lua
 -- --------------
@@ -5,93 +6,229 @@
 -- Function to simplify and unique text formatting in scenarios and help files.
 -- Most of these functions are simple wrapper functions that make working with
 -- widelands rich text formatting system more bearable.
+-- Function names generally follow HTML names.
 
 -- RST
--- .. function:: rt(text_or_options[, text = nil])
---
---    Wraps a block of text into Lua rich text: <rt>%s</rt>.
---
---    :arg text_or_options: either the text of this rich text
---       or any options you care to give it (e.g. image=pic.png).
---    :type text_or_options: :class:`string`
---    :arg text: if text_or_options is given, this will be the text of the
---       rich text.
+-- .. function:: rt(text_or_attributes[, text = nil])
+--
+--    Wraps a block of text into Lua rich text.
+--    Only call this once for the whole text that gets sent to the backend.
+--    There is no general need to wrap an rt tag around your text,
+--    because the backend will take care of it.
+--    So, only use this function if you wish to add some attributes to the tag.
+--
+--    Allowed attributes are: NOCOM
+--
+--    :arg attributes: the attributes for the rt tag.
+--    :type attributes: :class:`string`
+--    :arg text: the text to be enclosed in rich text tags.
+--    :type text: :class:`string`
 --    :returns: the wrapped rich text.
 --
-function rt(text_or_opts, text)
-   local k = "<rt>"
+function rt(text_or_attributes, text)
    if text then
-      k = ("<rt %s>"):format(text_or_opts)
-   else
-      text = text_or_opts
-   end
-
-   return k .. text .. "</rt>"
-end
-
--- RST
--- .. function:: h1(s)
+      return "<rt " .. text_or_attributes .. ">" .. text .. "</rt>"
+   else
+      return "<rt>" .. text_or_attributes .. "</rt>"
+   end
+end
+
+
+-- RST
+-- .. function:: img(src, [ref])
+--
+--    Turns an image src path into an image tag for richtext.
+--
+--    :arg src: the file path to the image.
+--    :type src: :class:`string`
+--    :arg ref: NOCOM.
+--    :type ref: :class:`string`
+--    :returns: the img tag.
+--
+function img(src, ref)
+   if ref then
+      return "<img src=" .. src .." ref=" .. ref .. ">"
+   else
+      return "<img src=" .. src .. ">"
+   end
+end
+
+
+function title(font_face, text)
+   return p_font("align=center", "size=38 face=".. font_face .. " color=2F9131", text)
+end
+
+
+-- RST
+-- .. function:: h1(text_or_color[, text = nil])
 --
 --    Returns a paragraph formatted as a big heading with a small gap after it.
 --    The mnemonic comes from HTML.
 --
---    :returns: A paragraph with s formatted as heading.
-function h1(s)
-   return "<p font-size=18 font-weight=bold font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=8> <br></p>"
+--    :returns: A paragraph with text formatted as heading.
+function h1(text_or_color, text)
+   if text then
+      return p_font("", "size=18 bold=1 color=".. text_or_color .. " face=serif", text)
+   else
+      return p_font("", "size=18 bold=1 color=D1D1D1 face=serif", text_or_color)
+   end
 end
 
 -- RST
--- .. function:: h2(s)
+-- .. function:: h2(text)
 --
 --    Like :func:`h1` but smaller.
 --
---    :returns: A paragraph with s formatted as heading.
-function h2(s)
-   return "<p font-size=2> <br></p><p font-size=14 font-weight=bold font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=4> <br></p>"
+--    :returns: A paragraph with text formatted as heading.
+function h2(text)
+   return p_font("", "size=2 face=serif", "") .. p_font("", "size=14 bold=1 color=D1D1D1 face=serif", text)
 end
 
 -- RST
--- .. function:: h3(s)
+-- .. function:: h3(text)
 --
 --    Like :func:`h2` but smaller.
 --
---    :returns: A paragraph with s formatted as heading.
+--    :returns: A paragraph with text formatted as heading.
 --
-function h3(s)
-   return "<p font-size=13 font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=4> <br></p>"
+function h3(text)
+   return p_font("", "size=13 italic=1 color=D1D1D1 face=serif", text)
 end
 
 -- RST
--- .. function:: h4(s)
+-- .. function:: h4(text)
 --
 --    Like :func:`h3` but smaller.
 --
---    :returns: A paragraph with s formatted as heading.
---
-function h4(s)
-   return "<p font-size=12 font-style=italic font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=4> <br></p>"
-end
-
--- RST
--- .. function:: p(text_or_options[, text = nil])
---
---    Returns one paragraph with text followed by a small vertical gap. Options
---    can be given as first argument similar to :func:`rt`, otherwise the
---    default options will be :const:`line-spacing=3 font-size=12`.
---
---    :returns: The text wrapped in <p>%s</p>
-function p(text_or_opts, text)
-   local opts = "line-spacing=3 font-size=12"
-   if text then
-      opts = text_or_opts
-   else
-      text = text_or_opts
-   end
-
-   return ("<p %s>"):format(opts) .. text .. "<br></p>" ..
-      "<p font-size=8> <br></p>"
+--    :returns: A paragraph with text formatted as heading.
+--
+function h4(text)
+   return p_font("", "size=12 italic=1 color=D1D1D1 face=serif", text)
+end
+
+-- RST
+-- .. function:: p(text_or_attributes[, text = nil])
+--
+--    Returns one paragraph with text followed by a small vertical gap. Options
+--    can be given as first argument similar to :func:`rt`.
+--
+--    :returns: The text wrapped in <p>%s</p>
+function p(text_or_attributes, text)
+   if text then
+      return open_p(text_or_attributes) .. text .. close_p()
+   else
+      return open_p() .. text_or_attributes .. close_p()
+   end
+end
+
+
+-- RST
+-- .. function:: p(text_or_attributes[, text = nil])
+--
+--    Returns one paragraph with text followed by a small vertical gap. Options
+--    can be given as first argument similar to :func:`rt`.
+--
+--    :returns: The text wrapped in <p>%s</p>
+function p_font(p_or_font_or_attributes, text_or_font_attributes, text)
+   if text then
+      return ("<p %s>"):format(p_or_font_or_attributes) .. "<font " .. text_or_font_attributes .. ">" .. text .. close_p()
+   else
+      return "<p><font " .. p_or_font_or_attributes .. ">" .. text_or_font_attributes .. close_p()
+   end
+end
+
+
+-- RST
+-- .. function:: open_p([attributes = nil])
+--
+--    Returns a paragraph open tag and default font size. Options
+--    can be given as first argument similar to :func:`rt`.
+--
+--    :returns: <p> with added attributes and default font
+function open_p(attributes)
+   if attributes then
+      return ("<p %s>"):format(attributes) .. "<font size=12>"
+   else
+      return "<p><font size=12>"
+   end
+end
+
+
+-- RST
+-- .. function:: close_p(t)
+--
+--    Closes a paragraph.
+--
+--    :returns: The closing tags for a paragraph
+function close_p(t)
+   return "</font></p>"
+end
+
+-- RST
+-- .. function:: font(attributes, text = nil)
+--
+--    NOCOM
+function font(attributes, text)
+   return ("<font %s>"):format(attributes) .. text .. "</font>"
+end
+
+-- RST
+-- .. function:: dl(dt, dd)
+--
+-- Description list
+--    NOCOM
+function dl(dt, dd)
+   return p(b(dt) .. " " .. dd)
+end
+
+-- RST
+-- .. function:: li(text_or_symbol[, text = nil])
+--
+--    Adds the symbol in front of the text to create a list item and
+--    wraps it in a paragraph
+--
+--    :arg symbol: the item symbol for the list, e.g. "•" or "→"
+--    :arg text: the text of the list item
+--
+--    :returns: // NOCOM update documentation
+function li(text_or_symbol, text)
+   if text then
+      return p(text_or_symbol .. " " .. text)
+   else
+      return p("• " .. text_or_symbol)
+   end
+end
+
+function a(link)
+   return font("underline=1", link)
+end
+
+function b(text)
+   return font("bold=1", text)
+end
+
+function i(text)
+   return font("italic=1", text)
+end
+
+function u(text)
+   return font("underline=1", text)
+end
+
+
+function div(text_or_attributes, text)
+   if text then
+      return ("<div %s>"):format(text_or_attributes) .. text .. "</div>"
+   else
+      return ("<div>") .. text_or_attributes .. "</div>"
+   end
+end
+
+
+function td(width_or_text, text)
+   if text then
+      return div("width=" .. width_or_text, text)
+   else
+      return div(width_or_text)
+   end
 end

=== modified file 'scripting/win_condition_functions.lua'
--- scripting/win_condition_functions.lua	2014-10-02 20:45:24 +0000
+++ scripting/win_condition_functions.lua	2015-08-01 06:21:02 +0000
@@ -1,3 +1,4 @@
+include "scripting/formatting.lua"
 include "scripting/messages.lua"
 
 -- RST

=== modified file 'scripting/win_conditions/collectors.lua'
--- scripting/win_conditions/collectors.lua	2015-05-06 07:15:40 +0000
+++ scripting/win_conditions/collectors.lua	2015-08-01 06:21:02 +0000
@@ -3,8 +3,8 @@
 -- =======================================================================
 
 include "scripting/coroutine.lua" -- for sleep
+include "scripting/formatting.lua"
 include "scripting/messages.lua"
-include "scripting/formatting.lua"
 include "scripting/table.lua"
 include "scripting/win_condition_functions.lua"
 
@@ -25,14 +25,7 @@
 	func = function()
 
    -- set the objective with the game type for all players
-   broadcast_objective("win_condition", wc_name, wc_desc)
-
-   -- Simple flowing text. One Paragraph
-   local function p(s)
-      return "<p line-spacing=3 font-size=12>" .. s .. "<br></p>" ..
-         "<p font-size=8> <br></p>"
-   end
-
+   broadcast_objective("win_condition", wc_name, p(wc_desc))
 
    -- The list of wares that give points
    local point_table = {
@@ -97,7 +90,7 @@
       )
 
       local points = 0
-      local descr = { "</p>" .. h2((_"Status for %s"):format(plr.name)) .. "<p line-spacing=3 font-size=12>"}
+      local descr = {h2((_"Status for %s"):format(plr.name))}
       for idx, ware in ipairs(point_table[plr.tribe_name .. "_order"]) do
          local value = point_table[plr.tribe_name][ware]
          local count = 0
@@ -108,13 +101,12 @@
          points = points + lpoints
          local warename = wl.Game():get_ware_description(plr.tribe_name, ware).descname
          -- TRANSLATORS: For example: 'gold (3 P) x 4 = 12 P", P meaning "Points'
-         descr[#descr+1] = [[• ]] .. (_"  %1$s (%2$i P) x %3$i = %4$i P"):bformat(
-            warename, value, count, lpoints
-         ) .. "<br>"
+         descr[#descr+1] =
+				li((_"  %1$s (%2$i P) x %3$i = %4$i P"):bformat(
+					warename, value, count, lpoints))
       end
-      descr[#descr+1] =  "</p>" .. h3(ngettext("Total: %i point", "Total: %i points", points)):format(points)
-              .. "<p line-spacing=3 font-size=12>"
-      return points, p(table.concat(descr, "\n"))
+      descr[#descr+1] =  h3(ngettext("Total: %i point", "Total: %i points", points)):format(points)
+      return points, table.concat(descr, "")
    end
 
    local plrs = wl.Game().players
@@ -131,7 +123,6 @@
          time = (ngettext("%i minute", "%i minutes", m)):format(m)
       end
       local msg = p(_"The game will end in %s."):format(time)
-      msg = msg .. "\n\n"
 
       for idx, plr in ipairs(plrs) do
          local points, pstat = _calc_points(plr)
@@ -140,7 +131,7 @@
       end
 
       for idx, plr in ipairs(plrs) do
-			send_message(plr, game_status.title,  "<rt>" .. msg .. "</rt>", {popup = true})
+			send_message(plr, game_status.title, msg, {popup = true})
       end
    end
 

=== modified file 'scripting/win_conditions/defeat_all.lua'
--- scripting/win_conditions/defeat_all.lua	2015-01-31 08:39:43 +0000
+++ scripting/win_conditions/defeat_all.lua	2015-08-01 06:21:02 +0000
@@ -3,6 +3,7 @@
 -- =======================================================================
 
 include "scripting/coroutine.lua" -- for sleep
+include "scripting/formatting.lua"
 include "scripting/win_condition_functions.lua"
 
 set_textdomain("win_conditions")
@@ -19,7 +20,7 @@
 		local plrs = wl.Game().players
 
 		-- set the objective with the game type for all players
-		broadcast_objective("win_condition", wc_name, wc_desc)
+		broadcast_objective("win_condition", wc_name, p(wc_desc))
 
 		-- Iterate all players, if one is defeated, remove him
 		-- from the list, send him a defeated message and give him full vision

=== modified file 'scripting/win_conditions/endless_game.lua'
--- scripting/win_conditions/endless_game.lua	2015-01-31 08:39:43 +0000
+++ scripting/win_conditions/endless_game.lua	2015-08-01 06:21:02 +0000
@@ -3,6 +3,7 @@
 -- =======================================================================
 
 include "scripting/coroutine.lua" -- for sleep
+include "scripting/formatting.lua"
 include "scripting/win_condition_functions.lua"
 
 set_textdomain("win_conditions")
@@ -19,7 +20,7 @@
 		local plrs = wl.Game().players
 
 		-- set the objective with the game type for all players
-		broadcast_objective("win_condition", wc_name, wc_desc)
+		broadcast_objective("win_condition", wc_name, p(wc_desc))
 
 		-- Iterate all players, if one is defeated, remove him
 		-- from the list, send him a defeated message and give him full vision

=== modified file 'scripting/win_conditions/endless_game_fogless.lua'
--- scripting/win_conditions/endless_game_fogless.lua	2015-01-31 08:39:43 +0000
+++ scripting/win_conditions/endless_game_fogless.lua	2015-08-01 06:21:02 +0000
@@ -3,6 +3,7 @@
 -- =======================================================================
 
 include "scripting/coroutine.lua" -- for sleep
+include "scripting/formatting.lua"
 include "scripting/win_condition_functions.lua"
 
 set_textdomain("win_conditions")
@@ -19,7 +20,7 @@
 		local plrs = wl.Game().players
 
 		-- set the objective with the game type for all players
-		broadcast_objective("win_condition", wc_name, wc_desc)
+		broadcast_objective("win_condition", wc_name, p(wc_desc))
 
 		-- reveal the whole map for every player
 		local game = wl.Game()

=== modified file 'scripting/win_conditions/territorial_lord.lua'
--- scripting/win_conditions/territorial_lord.lua	2015-01-31 08:39:43 +0000
+++ scripting/win_conditions/territorial_lord.lua	2015-08-01 06:21:02 +0000
@@ -3,6 +3,7 @@
 -- =======================================================================
 
 include "scripting/coroutine.lua" -- for sleep
+include "scripting/formatting.lua"
 include "scripting/messages.lua"
 include "scripting/table.lua"
 include "scripting/win_condition_functions.lua"
@@ -25,7 +26,7 @@
 		local plrs = wl.Game().players
 
 		-- set the objective with the game type for all players
-		broadcast_objective("win_condition", wc_name, wc_desc)
+		broadcast_objective("win_condition", wc_name, p(wc_desc))
 
 		-- Get all valueable fields of the map
 		local fields = {}
@@ -168,9 +169,9 @@
 			for idx, p in ipairs(plrs) do
 				if candidateisteam and currentcandidate == p.team
 					or not candidateisteam and currentcandidate == p.name then
-					send_message(p, game_status.title, msg2, {popup = true})
+					send_message(p, game_status.title, p(msg2), {popup = true})
 				else
-					send_message(p, game_status.title, msg1, {popup = true})
+					send_message(p, game_status.title, p(msg1), {popup = true})
 				end
 			end
 		end

=== modified file 'scripting/win_conditions/territorial_time.lua'
--- scripting/win_conditions/territorial_time.lua	2015-01-31 08:39:43 +0000
+++ scripting/win_conditions/territorial_time.lua	2015-08-01 06:21:02 +0000
@@ -3,6 +3,7 @@
 -- =======================================================================
 
 include "scripting/coroutine.lua" -- for sleep
+include "scripting/formatting.lua"
 include "scripting/messages.lua"
 include "scripting/table.lua"
 include "scripting/win_condition_functions.lua"
@@ -30,7 +31,7 @@
 		local plrs = wl.Game().players
 
 		-- set the objective with the game type for all players
-		broadcast_objective("win_condition", wc_name, wc_desc)
+		broadcast_objective("win_condition", wc_name, p(wc_desc))
 
 		-- Get all valueable fields of the map
 		local fields = {}
@@ -232,7 +233,7 @@
 				msg = msg .. "\n\n"
 				msg = msg .. game_status.body
 				msg = msg .. _status(points, "has")
-				send_message(p, game_status.title, msg, {popup = true})
+				send_message(p, game_status.title, p(msg), {popup = true})
 			end
 		end
 

=== modified file 'scripting/win_conditions/wood_gnome.lua'
--- scripting/win_conditions/wood_gnome.lua	2015-03-21 13:18:02 +0000
+++ scripting/win_conditions/wood_gnome.lua	2015-08-01 06:21:02 +0000
@@ -1,8 +1,9 @@
 -- =======================================================================
 --                       Wood Gnome win condition
 -- =======================================================================
-
+-- NOCOM(#gunchleoc): fix status
 include "scripting/coroutine.lua" -- for sleep
+include "scripting/formatting.lua"
 include "scripting/table.lua"
 include "scripting/win_condition_functions.lua"
 
@@ -24,7 +25,7 @@
    local plrs = wl.Game().players
 
    -- set the objective with the game type for all players
-   broadcast_objective("win_condition", wc_name, wc_desc)
+   broadcast_objective("win_condition", wc_name, p(wc_desc))
 
 	local remaining_time = 4 * 60 -- 4 hours
 
@@ -91,7 +92,7 @@
 			msg = msg ..  (_"%1$s has %2$s at the moment."):bformat(plr.name,trees)
 		end
 
-		broadcast(plrs, game_status.title, msg)
+		broadcast(plrs, game_status.title, p(msg))
 	end
 
 	-- Start a new coroutine that checks for defeated players
@@ -149,12 +150,12 @@
 	for i=1,#points-1 do
 		privmsg = lost_game_over.title
 		privmsg = privmsg .. msg
-		points[i][1]:send_message(lost_game_over.body, privmsg)
+		points[i][1]:send_message(lost_game_over.body, p(privmsg))
 		wl.game.report_result(points[i][1], 0, make_extra_data(points[i][1], wc_name, wc_version, {score=points[i][2]}))
 	end
 	privmsg = won_game_over.title
 	privmsg = privmsg .. msg
-	points[#points][1]:send_message(won_game_over.body, privmsg)
+	points[#points][1]:send_message(won_game_over.body, p(privmsg))
    wl.game.report_result(points[#points][1], 1,
       make_extra_data(points[#points][1], wc_name, wc_version, {score=points[#points][2]}))
 end

=== modified file 'src/base/i18n.cc'
--- src/base/i18n.cc	2015-01-31 14:28:10 +0000
+++ src/base/i18n.cc	2015-08-01 06:21:02 +0000
@@ -352,5 +352,6 @@
 	return result;
 }
 
-
 }
+
+

=== modified file 'src/base/i18n.h'
--- src/base/i18n.h	2015-01-30 23:10:35 +0000
+++ src/base/i18n.h	2015-08-01 06:21:02 +0000
@@ -27,6 +27,7 @@
 #include <libintl.h>  // for ngettext.
 
 #include "base/macros.h"
+#include "graphic/text/layout_info.h"
 #include "config.h"
 
 ///A macro to make i18n more readable and aid in tagging strings for translation

=== modified file 'src/editor/CMakeLists.txt'
--- src/editor/CMakeLists.txt	2015-01-31 16:03:59 +0000
+++ src/editor/CMakeLists.txt	2015-08-01 06:21:02 +0000
@@ -89,6 +89,7 @@
     base_scoped_timer
     graphic
     graphic_surface
+    graphic_text_layout
     io_filesystem
     logic
     logic_widelands_geometry

=== modified file 'src/editor/tools/editor_info_tool.cc'
--- src/editor/tools/editor_info_tool.cc	2015-02-24 13:51:38 +0000
+++ src/editor/tools/editor_info_tool.cc	2015-08-01 06:21:02 +0000
@@ -21,10 +21,13 @@
 
 #include <cstdio>
 
+#include <boost/algorithm/string/join.hpp>
 #include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
 
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
+#include "graphic/format.h"
 #include "logic/map.h"
 #include "logic/world/editor_category.h"
 #include "logic/world/terrain_description.h"
@@ -48,118 +51,133 @@
 
 	Widelands::Field & f = map[center.node];
 
-	// *** Node info
-	std::string buf = _("Node:");
-	buf += "\n";
-	buf += "• " + (boost::format(_("Coordinates: (%1$i, %2$i)"))
-					 % center.node.x % center.node.y).str() + "\n";
-
-	std::string temp = "";
-	Widelands::NodeCaps const caps = f.nodecaps();
-	switch (caps & Widelands::BUILDCAPS_SIZEMASK) {
-		/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-		case Widelands::BUILDCAPS_SMALL:  temp += _(" small");  break;
-		/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-		case Widelands::BUILDCAPS_MEDIUM: temp += _(" medium"); break;
-		/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-		case Widelands::BUILDCAPS_BIG:    temp += _(" big");    break;
-		default: break;
-	};
-	/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-	if (caps & Widelands::BUILDCAPS_FLAG) temp += _(" flag");
-	/** TRANSLATORS: This is part of a list, e.g. Caps: flag mine walk */
-	if (caps & Widelands::BUILDCAPS_MINE) temp += _(" mine");
-	/** TRANSLATORS: This is part of a list, e.g. Caps: big flag port walk */
-	if (caps & Widelands::BUILDCAPS_PORT) temp += _(" port");
-	/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-	if (caps & Widelands::MOVECAPS_WALK)  temp += _(" walk");
-	/** TRANSLATORS: This is part of a list, e.g. Caps: swim */
-	if (caps & Widelands::MOVECAPS_SWIM)  temp += _(" swim");
-
-	buf += std::string("• ") + (boost::format(_("Caps:%s")) % temp).str() + "\n";
-
-	if (f.get_owned_by() > 0) {
-		buf += std::string("• ") +
-				 (boost::format(_("Owned by: Player %u"))
-				  % static_cast<unsigned int>(f.get_owned_by())).str() + "\n";
-	} else {
-		buf += std::string("• ") + _("Owned by: —") + "\n";
-	}
-
-	temp = f.get_immovable() ? _("Has base immovable") : _("No base immovable");
-	buf += "• " + temp + "\n";
-
-	temp = f.get_first_bob() ? _("Has animals") : _("No animals");
-	buf += "• " + temp + "\n";
-
-	// *** Terrain info
-	buf += std::string("\n") + _("Terrain:") + "\n";
-
-	const Widelands::Field         & tf  = map[center.triangle];
-	const Widelands::TerrainDescription& ter = world.terrain_descr(
-	   center.triangle.t == Widelands::TCoords<>::D ? tf.terrain_d() : tf.terrain_r());
-
-	buf += "• " + (boost::format(_("Name: %s")) % ter.descname()).str() + "\n";
-
-	Widelands::TerrainDescription::Type terrain_is = ter.get_is();
-	std::vector<std::string> terrain_is_strings;
-
-	if (terrain_is == Widelands::TerrainDescription::Type::kGreen) {
-		terrain_is_strings.push_back(_("arable"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kDry) {
-		terrain_is_strings.push_back(_("treeless"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kWater) {
-		terrain_is_strings.push_back(_("aquatic"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kDead) {
-		terrain_is_strings.push_back(_("dead"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kMountain) {
-		terrain_is_strings.push_back(_("mountainous"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kImpassable) {
-		terrain_is_strings.push_back(_("impassable"));
-	}
-	buf += "• " + (boost::format(_("Category: %s"))
-						% i18n::localize_list(terrain_is_strings, i18n::ConcatenateWith::AMPERSAND)).str() + "\n";
-	buf += "• " + (boost::format(_("Editor Category: %s")) % ter.editor_category().descname()).str() + "\n";
-
-	// *** Resources info
-	buf += std::string("\n") + _("Resources:") + "\n";
-
-	Widelands::ResourceIndex ridx = f.get_resources();
-	int ramount = f.get_resources_amount();
-
-	if (ramount > 0) {
-		buf += "• " + (boost::format(
-				_("Resource name: %s")) % world.get_resource(ridx)->name().c_str()
-			).str() + "\n";
-		buf += "• " + (boost::format(_("Resource amount: %i")) % ramount).str() + "\n";
-	}
-	else {
-		buf += "• " + std::string(_("No resources")) + "\n";
-	}
-
-	// *** Map info
-	buf += std::string("\n") + _("Map:") + "\n";
-	buf += "• " + (boost::format(_("Name: %s")) % map.get_name().c_str()).str() + "\n";
-	buf += "• " + (boost::format(_("Size: %1$ix%2$i"))
-					 % map.get_width() % map.get_height()).str() + "\n";
-
-	if (map.get_nrplayers() > 0) {
-		buf += "• " +
-		       (boost::format(_("Players: %d")) % static_cast<int>(map.get_nrplayers())).str() + "\n";
-	}
-	else {
-		buf += "• " + std::string(_("Players: -")) + "\n";
-	}
-
-	buf += "• " + (boost::format(_("Author: %s")) % map.get_author()).str() + "\n";
-	buf += "• " + (boost::format(_("Descr: %s")) % map.get_description().c_str()).str() + "\n";
-
-	multiline_textarea->set_text(buf.c_str());
+	constexpr int kLeftColumnWidth = 130;
+	std::vector<std::string> elements;
+	const auto add_title_row = [multiline_textarea, &elements](const std::string& text) {
+		elements.push_back(
+		RT::div({RT::attribute("width", multiline_textarea->get_effective_width())},
+			RT::p(RT::ui_font(
+				{RT::attribute("size", 22), RT::attribute("underline", 1)},
+				text))));
+	};
+
+	const auto add_row = [multiline_textarea, kLeftColumnWidth, &elements](
+	   const std::string& left_text, const std::string& right_text) {
+		elements.push_back(RT::p(
+			RT::div({RT::attribute("width", kLeftColumnWidth)},
+		           RT::ui_font(left_text)) +
+		   "<space fill=\".\">" +
+			RT::div(
+			{
+				RT::attribute("width", multiline_textarea->get_effective_width() - kLeftColumnWidth),
+			},
+			RT::ui_font(right_text))));
+	};
+	// NOCOM(GunChleoc): This needs a full overhaul
+	// NOCOM(#sirver): needs valign, unfortunately it seems buggy when used here.
+	// NOCOM(#sirver): support for relative font sizes (in percent). #gunchleoc: done.
+
+	add_title_row(_("Field:"));
+	add_row(_("Coordinates:"),
+			  /** TRANSLATORS: X, Y coordinates of a field. */
+	        (boost::format(_("(%1$i, %2$i)")) % center.node.x % center.node.y).str());
+
+	{
+		std::string temp = "";
+		Widelands::NodeCaps const caps = f.nodecaps();
+		switch (caps & Widelands::BUILDCAPS_SIZEMASK) {
+			/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
+			case Widelands::BUILDCAPS_SMALL:  temp += _(" small");  break;
+			/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
+			case Widelands::BUILDCAPS_MEDIUM: temp += _(" medium"); break;
+			/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
+			case Widelands::BUILDCAPS_BIG:    temp += _(" big");    break;
+			default: break;
+		};
+		/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
+		if (caps & Widelands::BUILDCAPS_FLAG) temp += _(" flag");
+		/** TRANSLATORS: This is part of a list, e.g. Caps: flag mine walk */
+		if (caps & Widelands::BUILDCAPS_MINE) temp += _(" mine");
+		/** TRANSLATORS: This is part of a list, e.g. Caps: big flag port walk */
+		if (caps & Widelands::BUILDCAPS_PORT) temp += _(" port");
+		/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
+		if (caps & Widelands::MOVECAPS_WALK)  temp += _(" walk");
+		/** TRANSLATORS: This is part of a list, e.g. Caps: swim */
+		if (caps & Widelands::MOVECAPS_SWIM)  temp += _(" swim");
+		add_row(_("Caps:"), temp);
+	}
+
+	add_row(_("Owned by:"),
+			  f.get_owned_by() ?
+				  boost::lexical_cast<std::string>(static_cast<int>(f.get_owned_by())) :
+				  "-");