[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-31 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1525680 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1525680/+merge/283793 -- Your team Widelands Developers is subscribed to branch lp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-31 Thread SirVer
lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525680/+merge/283793 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1525680. ___ Mailing list: https://launchpad.net/~widelands-

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-31 Thread GunChleoc
I have pulled the functions out. The for loop has to stay as it is, because I am referencing iterator.end(). -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525680/+merge/283793 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1525680. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-30 Thread SirVer
I think you are right about the nodes - they will not get broken apart IMHO. About the moribund question - right now the code is used in two places, who knows how long it takes us to get rid of richtext.cc, maybe it is around for years again and then we have the code to maintain in two places. I

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-29 Thread GunChleoc
About the nits: richtext.cc is moribund, so I don't want to make any code changes to accommodate it that I will need to undo later. Does that make sense? I haven't tested the behaviour in the renderers carefully, but I expect a word node won't be broken up into multiple lines - otherwise, there

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-29 Thread SirVer
Review: Needs Information -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525680/+merge/283793 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1525680. ___ Mailing list: https://launchpad.net/~widela

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-29 Thread SirVer
Some code nits, not tested. What guarantees that the richtext renderer does not break   when layouting the text? It seems it is equivalent to a regular space. Diff comments: > === modified file 'src/graphic/richtext.cc' > --- src/graphic/richtext.cc 2016-01-28 21:27:04 + > +++ src/graph

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-26 Thread bunnybot
Continuous integration builds have changed state: Travis build 399. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104835701. Appveyor build 306. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525680-

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Continuous integration builds have changed state: Travis build 388. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104680218. Appveyor build 296. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525680-2

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Continuous integration builds have changed state: Travis build 388. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104680218. Appveyor build 296. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525680-2

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525680/+merge/283793 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1525680 into lp:widelands. __

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Continuous integration builds have changed state: Travis build 388. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104680218. Appveyor build 296. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525680-2

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal: -- https://code.launchpad.net/~widelands-dev/widelands/bug-1525680/+merge/283793 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1525680 into lp:widelands. __

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Continuous integration builds have changed state: Travis build 388. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/104680218. Appveyor build 296. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525680-2

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Continuous integration builds have changed state: Travis build 388. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/104680218. Appveyor build 296. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525680-2

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Continuous integration builds have changed state: Travis build 387. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/104625760. Appveyor build 295. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1525680-

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread bunnybot
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/bug-1525680 mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1525680 You can give me commands by starting a line with @bunnybot . I understa

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1525680 into lp:widelands

2016-01-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1525680 into lp:widelands. Commit message: Richtext and rt_render can now handle  . Shifted handling of < and > from parser to renderer. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1525680 in widel