Merge pull request #346 from TES3MP/master

Add master commits up to 24 Nov 2017

apps/openmw/mwgui/bookpage.cpp

@@ -16,6 +16,7 @@ class BookPageImpl;
 
 static bool ucsSpace (int codePoint);
 static bool ucsLineBreak (int codePoint);
+static bool ucsCarriageReturn (int codePoint);
 static bool ucsBreakingSpace (int codePoint);
 
 struct BookTypesetter::Style { virtual ~Style () {} };
@@ -1188,6 +1189,9 @@ public:
             {
                 Utf8Stream::UnicodeChar code_point = stream.consume ();
 
+                if (ucsCarriageReturn (code_point))
+                    continue;
+
                 if (!ucsSpace (code_point))
                     glyphStream.emitGlyph (code_point);
                 else
@@ -1331,6 +1335,11 @@ static bool ucsLineBreak (int codePoint)
     return codePoint == '\n';
 }
 
+static bool ucsCarriageReturn (int codePoint)
+{
+    return codePoint == '\r';
+}
+
 static bool ucsSpace (int codePoint)
 {
     switch (codePoint)