From 44c8c2a79cccdd1d7b929b15fb40365153960fa3 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 17 Feb 2019 23:18:28 +0100
Subject: [PATCH] - added German Umlauts for the BigFont and fixed the
 character substitution logic.

For pure uppercase fonts it makes no sense to try a lowercase substitution as a first step.
---
 src/gamedata/fonts/font.cpp                   |  54 +++++++++++++-----
 src/gamedata/fonts/v_font.h                   |   1 +
 .../game-doomchex/fonts/bigfont/00C4.lmp      | Bin 0 -> 301 bytes
 .../game-doomchex/fonts/bigfont/00D6.lmp      | Bin 0 -> 353 bytes
 .../game-doomchex/fonts/bigfont/00DC.lmp      | Bin 0 -> 296 bytes
 5 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00C4.lmp
 create mode 100644 wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00D6.lmp
 create mode 100644 wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00DC.lmp

diff --git a/src/gamedata/fonts/font.cpp b/src/gamedata/fonts/font.cpp
index a151f1095..a777cdef0 100644
--- a/src/gamedata/fonts/font.cpp
+++ b/src/gamedata/fonts/font.cpp
@@ -708,24 +708,52 @@ int FFont::GetCharCode(int code, bool needpic) const
 		return code;
 	}
 
-	int originalcode = code;
-	int newcode;
-	
-	// Try stripping accents from accented characters. This may repeat to allow multi-step fallbacks.
-	while ((newcode = stripaccent(code)) != code)
+	// Use different substitution logic based on the fonts content:
+	// In a font which has both upper and lower case, prefer unaccented small characters over capital ones.
+	// In a pure upper-case font, do not check for lower case replacements.
+	if (!MixedCase)
 	{
-		code = newcode;
-		if (code >= FirstChar && code <= LastChar && (!needpic || Chars[code - FirstChar].TranslatedPic != nullptr))
+		// Try converting lowercase characters to uppercase.
+		if (myislower(code))
 		{
-			return code;
+			code = upperforlower[code];
+			if (code >= FirstChar && code <= LastChar && (!needpic || Chars[code - FirstChar].TranslatedPic != nullptr))
+			{
+				return code;
+			}
+		}
+		// Try stripping accents from accented characters.
+		int newcode = stripaccent(code);
+		if (newcode != code)
+		{
+			code = newcode;
+			if (code >= FirstChar && code <= LastChar && (!needpic || Chars[code - FirstChar].TranslatedPic != nullptr))
+			{
+				return code;
+			}
 		}
 	}
-	
-	if (myislower(code))
+	else
 	{
-		int upper = upperforlower[code];
-		// Stripping accents did not help - now try uppercase for lowercase
-		if (upper != code) return GetCharCode(upper, needpic);
+		int originalcode = code;
+		int newcode;
+
+		// Try stripping accents from accented characters. This may repeat to allow multi-step fallbacks.
+		while ((newcode = stripaccent(code)) != code)
+		{
+			code = newcode;
+			if (code >= FirstChar && code <= LastChar && (!needpic || Chars[code - FirstChar].TranslatedPic != nullptr))
+			{
+				return code;
+			}
+		}
+
+		if (myislower(code))
+		{
+			int upper = upperforlower[code];
+			// Stripping accents did not help - now try uppercase for lowercase
+			if (upper != code) return GetCharCode(upper, needpic);
+		}
 	}
 
 	return -1;
diff --git a/src/gamedata/fonts/v_font.h b/src/gamedata/fonts/v_font.h
index 0702781e9..18ca18978 100644
--- a/src/gamedata/fonts/v_font.h
+++ b/src/gamedata/fonts/v_font.h
@@ -126,6 +126,7 @@ protected:
 	char Cursor;
 	bool noTranslate;
 	bool translateUntranslated;
+	bool MixedCase = false;
 	struct CharData
 	{
 		FTexture *TranslatedPic = nullptr;	// Texture for use with font translations.
diff --git a/wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00C4.lmp b/wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00C4.lmp
new file mode 100644
index 0000000000000000000000000000000000000000..88866e396cb066b679a54aaf0e546f47d13e7402
GIT binary patch
literal 301
zcmX|*!41MN3`J7`El?yDU>uHIDug1-K~XAB|H2Tgzy>V901UtgtiTFf!go_}^pg17
z`Oey{oW+*x$dR1Mg<Q#v+{uGH$&0+nhqRS*8?u<dBD-=nGbSO7f&z67B=tX~1EzCp
z@m<Gib}N8d3jVN9gU=F(=z~Z}tr<bsi(EB;M$^k(=o;<b(u8tvmC=-0WTZrKn4<6^
aqN;2h$Et>);?1J`<CG%T|4Fecd;S9bs9!Sx

literal 0
HcmV?d00001

diff --git a/wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00D6.lmp b/wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00D6.lmp
new file mode 100644
index 0000000000000000000000000000000000000000..b3cff0d2e82676ec9eb09a401387b5075b6f2de1
GIT binary patch
literal 353
zcmY+A%?$z}5QW*OiP61i3zlFBUOg-lLI@;eh^JSACD?*3*n%zCf-Ts=`e1(&Nj@g?
zc+3p!RIAE5lR!Xj<W3&sNnYelKIBW9MyWkHkRv&f3sDP{wHiXNHb7u5F>>$K7SPDr
zTC4M%cg8uRY3o%BBsdqNH#&_1;OM1Vgk}kJthFBFzffva2QO5|d}S2Ob#lnyu#B}W
q;CTig>s*{8AcT}8NfqkgF-FP4?$bk@PgzRI@=o@G2<tKZ|AikhHf#a_

literal 0
HcmV?d00001

diff --git a/wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00DC.lmp b/wadsrc_extra/static/filter/game-doomchex/fonts/bigfont/00DC.lmp
new file mode 100644
index 0000000000000000000000000000000000000000..ce8fc1b10317b6c9eee4a2694398c756773b5ddb
GIT binary patch
literal 296
zcmZ9HJqiLb5QRsuSab_}FJx(o6iWuegkbS%kKh%&f~~Estyl009zj^&gjE(Fe31Ej
zGucQlt{sV_k|Q~hGr5o}xsf}0kSBSOH|ZB5TOu8P8f66}<Wg&4a+Ea?kc#Uti;Yr`
zdmtm3WgWCmiODSnW1?FE`|l&rv}K~3c`5!4ndZqwku$gE)H--aL{clJgEzFhqWa=i
O=h*{-a-^L-|I!C`{a*e6

literal 0
HcmV?d00001