[Scummvm-git-logs] scummvm master -> d494b59efff6fbd37a859016d4a545686a4e0c5d

[OMGPizzaGuy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6b2183e7e3 ULTIMA8: Skip spaces at end of last line too
d494b59eff ULTIMA8: Ignore tabs at start of centered lines


Commit: 6b2183e7e3e80af32f10a68e22ca2d4d06409fe5
    https://github.com/scummvm/scummvm/commit/6b2183e7e3e80af32f10a68e22ca2d4d06409fe5
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2024-01-11T13:02:50-06:00

Commit Message:
ULTIMA8: Skip spaces at end of last line too

We were treating the last line differently from other lines because
it didn't end with a linebreak.

Fixes #14832.

Changed paths:
    engines/ultima/ultima8/graphics/fonts/font.cpp


diff --git a/engines/ultima/ultima8/graphics/fonts/font.cpp b/engines/ultima/ultima8/graphics/fonts/font.cpp
index 3138e9087ef..84ab5be24d9 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font.cpp
@@ -265,7 +265,8 @@ Std::list<PositionedText> typesetText(Font *font,
 					spaces.append(" ");
 				}
 			}
-			if (foundLF) continue;
+			// no next word?
+			if (foundLF || nextword == text.end()) continue;
 
 			// process word
 			Std::string::const_iterator endofnextword = iter;


Commit: d494b59efff6fbd37a859016d4a545686a4e0c5d
    https://github.com/scummvm/scummvm/commit/d494b59efff6fbd37a859016d4a545686a4e0c5d
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2024-01-11T13:02:50-06:00

Commit Message:
ULTIMA8: Ignore tabs at start of centered lines

This matches U8's behaviour in dosbox.

Changed paths:
    engines/ultima/ultima8/graphics/fonts/font.cpp


diff --git a/engines/ultima/ultima8/graphics/fonts/font.cpp b/engines/ultima/ultima8/graphics/fonts/font.cpp
index 84ab5be24d9..d4be6cd7867 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font.cpp
@@ -260,7 +260,9 @@ Std::list<PositionedText> typesetText(Font *font,
 					foundLF = true;
 					break;
 				} else if (T::isTab(iter, u8specials)) {
-					spaces.append("    ");
+					// ignore tabs at beginning of line when centered
+					if (!(curline.empty() && align == Font::TEXT_CENTER))
+						spaces.append("    ");
 				} else if (!curline.empty()) {
 					spaces.append(" ");
 				}