Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/gui/group_html.cpp

@@ -1517,7 +1517,14 @@ namespace NLGUI
 			}
 				break;
 			case HTML_BR:
-				addString(ucstring ("\n"));
+			{
+				endParagraph();
+
+				// insert zero-width-space (0x200B) to prevent removal of empty lines
+				ucstring tmp;
+				tmp.fromUtf8("\xe2\x80\x8b");
+				addString(tmp);
+			}
 				break;
 			case HTML_BODY:
 				{

code/nel/src/gui/group_table.cpp

@@ -1209,6 +1209,13 @@ namespace NLGUI
 	// ----------------------------------------------------------------------------
 	sint32	CGroupTable::getMaxUsedW() const
 	{
+		// Return table width if its requested by user.
+		// Need to do this because width of long line of text in here is calculated
+		// differently than final cell width in updateCoords()
+		// This will break tables with too narrow width set by user.
+		if (ForceWidthMin > 0)
+			return ForceWidthMin;
+
 		uint i;
 		uint column = 0;
 		vector<sint32> columns;