(svn r25949) -Fix [FS#5683]: text direction forcing characters were not filtered out, but shown as ? when ICU was not used for layouting. These are included in chat and console messages to force them to be displayed right

1 files changed, 6 insertions, 0 deletions

diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
index eca2d4ba4..d2059788b 100644
--- a/src/gfx_layout.cpp
+++ b/src/gfx_layout.cpp
@@ -481,6 +481,12 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
 				} else if (c == SCC_BIGFONT) {
 					state.SetFontSize(FS_LARGE);
 				} else {
+#ifndef WITH_ICU
+					/* Filter out text direction characters that shouldn't be drawn, and
+					 * will not be handled in the fallback non ICU case because they are
+					 * mostly needed for RTL languages which need more ICU support. */
+					if (IsTextDirectionChar(c)) continue;
+#endif
 					buff += AppendToBuffer(buff, buffer_last, c);
 					continue;
 				}