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

[GunChleoc]

Converted Tutorial 4 to new font renderer. Added new function "join_sentences(sentence1, sentence2)" to richtext.lua

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3063. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/329643125.
Appveyor build 2870. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_tutorial4-2870.

[Klaus Halfmann (klaus-halfmann)]

Travis had some trasient Issue only
> ... could not connect to ppa.launchpad.net:80 (91.189.95.83), connection timed out
> Unable to locate package g++-6

Same for appveyor:
> Fetching repository commit (0255238)...Error while copying content to a stream.

Code changes look straight forward, will compile and testplay this now.

[kaputtnik (franku)]

Tested with the fh1-tutorial2 branch and all LGTM :-)

review: Approve (testing)

[Klaus Halfmann (klaus-halfmann)]

Test this with
./wideland --scenario=/<AbsolutePathTo>widelands-repo/fh1-tutorial4/data/campaigns/tutorial04_economy.wmf/

kaputtnik: Did you test in English or in German?
I will then test the other variant.

[kaputtnik (franku)]

Oops, didn't test the objectives and there was one issue. In the 'Open the Ware Stastics window' part was a useless paragraphdivider(). I removed it and all looks good now.

[kaputtnik (franku)]

I have tested in english. The language shouldn't matter, as long the language has no special cases, imho.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3070. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/330255719.
Appveyor build 2877. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_tutorial4-2877.

[kaputtnik (franku)]

Klaus, did you finished your test?

[Klaus Halfmann (klaus-halfmann)]

Yes finished in German and found a few missing translations only.
In trunk I found, that the help for bulding sites is some HTML only.

review: Approve (compile testplay)

[kaputtnik (franku)]

> In trunk I found, that the help for bulding sites is some HTML only.

This is another task, imho

Thanks for testing :-)

@bunnybot merge

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3075. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/331167754.
Appveyor build 2882. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_tutorial4-2882.

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 3075. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/331167754.

[Klaus Halfmann (klaus-halfmann)]

Transient failure in Travis:

> Could not find compiler set in environment variable CC:
> clang-3.4.

No idea whats wrong there.

@bunnybot merge force

review: Approve

=== modified file 'data/campaigns/tutorial04_economy.wmf/scripting/texts.lua'
--- data/campaigns/tutorial04_economy.wmf/scripting/texts.lua	2017-12-16 10:48:12 +0000
+++ data/campaigns/tutorial04_economy.wmf/scripting/texts.lua	2018-01-20 11:37:48 +0000
@@ -6,8 +6,7 @@
 -- Some formating functions
 -- =========================
 
-include "scripting/formatting.lua"
-include "scripting/format_scenario.lua"
+include "scripting/richtext_scenarios.lua"
 
 
 -- =============
@@ -16,7 +15,7 @@
 
 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.]]) ..
@@ -29,7 +28,7 @@
    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.]])
@@ -40,7 +39,7 @@
 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.]])
    ),
@@ -51,59 +50,51 @@
 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=images/wui/menus/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=images/wui/menus/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 window where you can easily check this.]]) ..
+      li_image("images/wui/menus/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.]]) ..
+      li_image("images/wui/menus/menu_building_stats.png", _[[Afterwards, choose the ‘Building statistics’.]]) ..
+      li(_[[Open the building statistics window.]]) ..
+      li_arrow(_[[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=images/wui/menus/menu_building_stats.png", p(_[[The building statistics window gives you an overview over the buildings you have.]])) ..
-   rt(
-      paragraphdivider() ..
+      li_image("images/wui/menus/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.]])
    ),
    obj_name = "check_taverns",
    obj_title = _"Look up how many taverns you have.",
-   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 = {
    title = _"You closed the building statistics window!",
-   body = rt(
+   body = (
       p(_[[You have closed the building statistics window. I didn’t notice that you switched to the medium buildings to look up the number of taverns. Would you please be so nice and show it to me?]])
    ),
    show_instantly = true,
@@ -114,11 +105,10 @@
 reopen_building_stat_obj = {
    obj_name = "open_building_stat_again",
    obj_title = _"Open the building statistics window again.",
-   obj_body = rt(
+   obj_body = (
       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,50 +116,45 @@
 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=images/wui/menus/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.]]) ..
+      li_image("images/wui/menus/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=images/wui/stats/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]]) ..
+      li_image("images/wui/stats/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!]])
@@ -180,7 +165,7 @@
 
 reopen_stock_menu = {
    title = _"You closed the stock window!",
-   body = rt(
+   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,
@@ -191,11 +176,10 @@
 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
 }
@@ -203,30 +187,27 @@
 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=images/ui_basic/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(_[[This encyclopedia can be accessed via]])..
+      li_image("images/ui_basic/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 wooden spear and a helmet – from there on out, you can search backwards.]])
    ),
    h = 350
@@ -235,7 +216,7 @@
 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’.]]) ..
@@ -249,83 +230,75 @@
 ware_stats1 = {
    position = "top",
    title = _"Ware Statistics",
-   body = rt(
-      p(_[[In the statistics menu, there is also a]])) ..
-      rt("image=images/wui/menus/menu_ware_stats.png",p(_[[‘Ware statistics’ button.]])) ..
-      rt(paragraphdivider() ..
+   body = (
+      p(_[[In the statistics menu, there is also a]]) ..
+      li_image("images/wui/menus/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=images/wui/stats/menu_tab_wares_econ_health.png",p(_[[third tab (‘Economy health’).]])
+      li(_[[I’ll continue as soon as you click on the]]) ..
+      li_image("images/wui/stats/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(
+   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,
@@ -336,17 +309,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(
+   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,
@@ -357,39 +329,35 @@
 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=images/wui/stats/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
+      li_image("images/wui/stats/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 the stock level in your warehouses falls below the target quantity, so you should indicate the reserve you want to stockpile.]]) ..
@@ -401,21 +369,19 @@
 
 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.]])
    )
 }
 
@@ -423,34 +389,32 @@
    field = warehouse_field,
    position = "topright",
    title = _"Warehouse Preferences",
-   body = rt(
+   body = (
       h1(_[[Bring the marble columns to the front line]]) ..
       p(_[[The production of marble columns is working fine now, 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:]]) ..
+      h1(p("align=center", u("widelands.org")))
 }

=== modified file 'data/scripting/richtext.lua'
--- data/scripting/richtext.lua	2018-01-07 18:04:57 +0000
+++ data/scripting/richtext.lua	2018-01-20 11:37:48 +0000
@@ -442,3 +442,19 @@
       div("width=100%", font("size=13 color=D1D1D1", header .. " ") ..
       font("size=12", text))
 end
+
+-- RST
+-- .. function:: join_sentences(sentence1, sentence2)
+--
+--    Joins 2 sentences together. Use this rather than manually concatenating
+--    a blank space, because some languages don't use blank spaces.
+--
+--    :arg sentence1: text of the first sentence
+--    :arg sentence2: text of the second sentence
+--    :returns: two concatenated sentences with a localized sentence joiner.
+--
+function join_sentences(sentence1, sentence2)
+   -- TRANSLATORS: Put 2 sentences one after the other.
+   -- TRANSLATORS: Languages using Chinese script probably want to lose the blank space here.
+   return pgettext("sentence_separator", "%s %s"):bformat(sentence1, sentence2)
+end