From 9644e26ce33a41b50a63524299f9c317daeb831c Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 16 Feb 2020 00:03:43 +0100
Subject: [PATCH] - removed accented Greek characters from BigUpper font as
 well.

I think the same applies as for allcaps fonts, and aside from that the form of accents being used here is not correct for Greek anyway.
---
 src/gamedata/fonts/v_font.cpp                 |  30 +++++++++++++++---
 .../filter/doom.id/fonts/bigupper/0386.lmp    | Bin 389 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/0388.lmp    | Bin 402 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/0389.lmp    | Bin 394 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/038A.lmp    | Bin 194 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/038C.lmp    | Bin 434 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/038E.lmp    | Bin 322 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/038F.lmp    | Bin 443 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/0390.lmp    | Bin 207 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/03AC.lmp    | Bin 301 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/03AD.lmp    | Bin 318 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/03AE.lmp    | Bin 341 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/03AF.lmp    | Bin 176 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/03B0.lmp    | Bin 320 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/03CC.lmp    | Bin 365 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/03CD.lmp    | Bin 304 -> 0 bytes
 .../filter/doom.id/fonts/bigupper/03CE.lmp    | Bin 371 -> 0 bytes
 17 files changed, 25 insertions(+), 5 deletions(-)
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/0386.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/0388.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/0389.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/038A.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/038C.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/038E.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/038F.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/0390.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AC.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AD.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AE.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AF.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/03B0.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CC.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CD.lmp
 delete mode 100644 wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CE.lmp

diff --git a/src/gamedata/fonts/v_font.cpp b/src/gamedata/fonts/v_font.cpp
index 25658ff41..be1dde8be 100644
--- a/src/gamedata/fonts/v_font.cpp
+++ b/src/gamedata/fonts/v_font.cpp
@@ -954,11 +954,9 @@ int getAlternative(int code)
 		case 0x3a7:
 			return 'X';
 
-		case 0x390:
 		case 0x3aa:
 			return 0xcf;
 
-		case 0x3b0:
 		case 0x3ab:
 			return 0x178;
 
@@ -971,11 +969,33 @@ int getAlternative(int code)
 		case 0x3c2:
 			return 0x3c3;	// Lowercase Sigma character in Greek, which changes depending on its positioning in a word; if the font is uppercase only or features a smallcaps style, the second variant of the letter will remain unused
 
-		case 0x3ca:
-			return 0xef;
+			// For smallcaps fonts the small accented Greek characters remap to the unaccented versions.
+		case 0x390:
+			return 0x3ca;
+
+		case 0x3ac:
+			return 0x3b1;
+
+		case 0x3ad:
+			return 0x3b5;
+
+		case 0x3ae:
+			return 0x3b7;
+
+		case 0x3af:
+			return 0x3b9;
+
+		case 0x3b0:
+			return 0x3cb;
 
 		case 0x3cc:
-			return 0xf3;
+			return 0x3bf;
+
+		case 0x3cd:
+			return 0x3c5;
+
+		case 0x3ce:
+			return 0x3c9;
 
 			// Cyrillic characters with equivalents in the Latin alphabet.
 		case 0x400:
diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/0386.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/0386.lmp
deleted file mode 100644
index eff9d85860a45b898672bde644115725e974e129..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 389
zcmWe)5M*FrU}6YhU|@(~U|>jMU|`5&U|^_WU|^WUz`(Gafq`K+0|UcZ1_p))3=9k(
z7#J9s85tNv85tNf85tOC85tM?7#SFn85tN#85tP(n6p6OKM!kGR#r+<R@Q$m_N=U|
zq@*Men}aheD=RTEF)<#*V`c&=W#b0Prz9mMCMAMI83nSkvLdsxlH%jzladk><Fm4|
z{xk4rWd%jXW<|!tL`Fu(L&SKqvcj{n!sBD2BcUQ-1DQF}(jsGGqGLcBnYgpE!lT3E
zQ$SW_W&LMj%gPFl2I=Qy$;t|h2MMueWd%pZXJsKo_@N?MS-~KsV1xLxvckio<Kq((
z!((FNK?eS3=1WV93=a<t4G#|wj|>O7o|!KzD=9J>3}RwpKte3MSy^cy-^7CeNCfO<
Jh=V}ne*kNUdtLwl

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/0388.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/0388.lmp
deleted file mode 100644
index 13f5554500f0c9fdc9233bae2a76b4de610fad08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmWe+5M*FrU}ErLU|<MlU|>jRU|^_bU|^WQz`(GAfq`KU0|Uba1_p*F3=9lE7#J9M
z7#SE87#SFh85tPd7#SEM85tOI7#SGq85tOunX<C7vi>u&WMySVW@WLlgScS)pMgIs
zD=0EHD=R4;1X4ii7zDDi!n3kcVq&7h!^0!PV^XrR{xg8hVCK!riU|)54Gs<r3=EFR
z%KFd5pOuvaQU_8Q9v+?q6$_6{%E}6jj0X`gu~3j$Acz37z<L8gI>1CQNCF}TVugYv
z0zd>p4D99rknDdZ)~u}H=%lPH9@eZZEJ9#wAgbb_s-PCIW@UvZLWQ92V9m;khY3Z-
PfSt<<whLlBnE4+70Oo!_

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/0389.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/0389.lmp
deleted file mode 100644
index 74301d896db4a364e723ac8a4986ff27b294aa83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmWe;5M*FrU}6YiU|@)5U|>jLU|`5&U|?urU|^WVz`(GMfq~%=0|Ub~1_p*#3=9lk
z7#JA-F)%Q2FfuR*F)}cyF)}b%F)}dtF)}bDF)}ceF)}bPGi7CEW&LMl$;!%#%*y)D
zz?zj66d4O*31(%5gCvphe+EGiH$E{j9t>ilqZ6~T{xk7sWd%k?N5@2lgFy^bEC3<~
z5)FolMaCy4CdNlc$H&LO^@7aIii}AF(^*;n*;%u)LP1<GD-gkoPlC!u$EQH;0PBfP
zOaaqSvFOCa#H6Ieq?DADlys<AaCA(3ViE+T!Ng)>;^UK&5<xBknGEtrOgzYeDJdyQ
NDM=`HKrH|T7XT8YfEfS)

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/038A.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/038A.lmp
deleted file mode 100644
index fd09fbaed881de665e8958370ea6fe6589141f66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 194
zcmd;N5M*FrU}Df=U|=w2U|_IeU|?`#U|@)0U|=X>U|?utU|^WVz`(GMfq{XUDJv^0
z>pvq)R#sMIR@Q$8)~u|c$XF0dFe@t@B#DgwGYEpXkulMc(a|wr5TBLxpNT&!D>OVb
mG&CFpA|qp<V!@H&;Sj;daG1L2cqm9rOiY5R1DT10{{sNIzdUOI

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/038C.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/038C.lmp
deleted file mode 100644
index 01e9a35de536603d0c7659144af660b03351abb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 434
zcmWe;5M*FrU}6YiU|@)5U|`5+U|?uwU|^WRz`(G9fq~%&0|Ubi1_p-L3=9na7#J7?
z85tN<7#SGM85tP77#SGi7#SFf7#SE^7#SF*F)}bLV`N}pX3EOS%KFd9l9iPenU%%H
z4&s9Ge+K@ntf0u)tgOVOw6wIOM36cLfvl|XtgN)ew4{{G^u)x(jI6Bx3}7>ud9$(-
zGm_F$(o#~Al2Wp={xk7|^robxr6eUKB__hf;!{A(tgNh<l$11(I@YYL_@uO~EFKUe
z1+0}dD=Q`uDioav6AF({fv5@v$^B<y&B_V~u|OI_;}fA~!G(gOVM38GjnOgjAXWTX
zS@CHp8DNh_Mn{9q=g-QDNlF1ZHZd_i5oGLtke_0bl2VeA6650&L56`u(qdu~6O$4X
Y<D)^YXW`Du$^vPK2RR_?KXMQP03^7J-T(jq

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/038E.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/038E.lmp
deleted file mode 100644
index 2edcf0f5d91e8cb0975ea4d66d2efbcb767a9103..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 322
zcmWe;5M*FrU}6YiU|@)5U|>jLU|`5&U|^_VU|?uwU|{HFU|^WRz`(GCfq`K=0|UcJ
z1_p*(3=9mf85kJ;GB7X*FfuU6FfuTxGcqt3GBPk&F)}bPGi7CEW&LMl$;!%#%*y)D
zz?zj66d4O;g@Yv-*g#ZhOjg!^Cf2O1;OImUi!CcFG(HB*WCt<h<CC(o{xkDsWyPeV
zq@;ngfboA8UWiaiN_tvq5=ap%PgYh;QhZ{3OiWBPOdv8bCOR@aG!$$PNKa^FXlQhF
zOmqy~;Lzx3klkQoK~7-L$_fk(4+lGpEh{THJTe|6%$k)I3R3r<i6tuwBE$^V^B(~6
Co@00b

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/038F.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/038F.lmp
deleted file mode 100644
index efc7e1410ea82fb27660bb24ecf172a1caac47db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 443
zcmWe(5M*FrU}A`1U|>jMU|=X>U|{HFU|?9xz`(GRfq~%?0|Ub|1_p*-3=9msj0_Co
zj0_Blj0_AWj0_AOj0_Ahj0_C<j0_A-j0_A@7#SFrGcqu2WMp9AVa<Yo|IADv28bUS
zo1B&PpOGaiD=RW9iw&j%Bo!73l420d$_k2%&B{uQjg3vr$_jythG%7^hJ!$4cz9%F
zd{)+f2C%Wrd|6qMP!Js+9-Ec*pNT&!D>^bf45TnJGAs-x79Jj!2y#hQczARoNF8fd
zRv5@Ako{nZ|4d*ZkV`<Up!ig%vhc*@tSlsDAR7`vvRPSK@$rdZ(?DXev9ZzN(XsKd
z@$n!ru;akah>eYn1^Wdglo}Zw9vK-P9Ssp;;myj*N{mlLco<8_fGmduABY8UEdUr1
Bi{$_S

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/0390.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/0390.lmp
deleted file mode 100644
index 4b744c7d7b7a7154aa30a5dd385e875ca9cd5a7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmd;L5M*FrU}7*}U|=w3U|?`yU|<MgU|`5#U|^_aU|^Wcz`(GQfq`K^0|Ube1_lOZ
zrmU>2tp7|bSy_?EAO?R{R#+lP437UZ@n>ZP#b-sw$Hd3S$Hc@WW@Y_n6oAMF$0sHx
zCdEgG$7f~zXAsQF3X06i$_kE&NsNzAiU%tNiH3trk4XZlO-hUh82}Q+VigP6s;vJ|
GcL4zXZ$aJw

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AC.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AC.lmp
deleted file mode 100644
index ec226a5450f74b5ac1392a39e6da5862a42bedf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 301
zcmd;Q;A3E5`2XL9fq}t?fq@~6fq@}|fq|ilfq|iyfq`Kj0|Ubb1_p+`3=9mX7#J9C
zGcYi`VPIhR%fP_E$H>4S$H>6I&71`S|2bK+va(`gva<d&Gl2xy*|V~;5~IUGB8<FQ
zSy_=FeoS~^V02d2e+Is+tf0u)ti+h`@X+AIERYaSR#tdcR#Hr4cqBvsYz{MfR#r@8
zG+2a*BP%O99>mPb`VZnn#$;uM#)CLKSy_RJSy`b;AiH4#N%8T~@$rd?Nl<~{@W{x>
q$mnR0Y5$pcK<<l<iH?bm3<sIP%$=2$k{F)|LLeP1ToAJ$<bMFeB4Kd=

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AD.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AD.lmp
deleted file mode 100644
index 371bb6f0d154f0c77a20f3b26eaea1a4a1a5af87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmd;Q;A3E5`2XL9fq}uBfq@~0fq@~Hfq|i(fq`KP0|UcS1_p+03=9m%85kIDFfcH@
zWME+U#lXP8&B(wY!^ps(%gDgM%#@XtmGz&IB`Yf{GAoM>M1uqvc(SsBB4e|%6650&
z!2-NlS>ah(De;k!k>SxPSy}%Xz*?EPva+JX!^0!P1LL!@{xk7pWyME^hlhuU1_viX
z1wtd^<HJEX1}YGln3WZtn3WX_(-NGNl@*$jl?68gq&GAvD=QFgMhcn=uyT+YFcl!f
ZK>9;r0x?NhS@B6(S<x^7kXK>&KLD4!XLJAn

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AE.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AE.lmp
deleted file mode 100644
index 1797c36c397ca7097102fea8c7e50ba9af87cb3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 341
zcmWe);A3E5`2RnEfq@~Mfq@}`fq@~5fq|ixfq`KH0|UcC1_p*r3=9m185kI@FfcIO
zWnf@<#=yYvo`HdZfsuhhkdc8wiIIW9n2~|Og^_`QnJFtPE9*ZaOIB7^WLDOH2G*>s
zpvYJdi!UoH93%<H{~7o|?3hFlh>wp?%*y)D#FLd38XprA6CD{I84nYP0SQD$M#BW6
zW8&jM+TxR-DnRB$CW6SUtp98*Sy`bV!$6EckRCV#WIRY!a6E{FYL1SHiHVE{nFtjK
oj0_JC4-X9uj)4h;hX#T`a5PjPIx#*z8U#Srzzl^LnU(b)07I2+wEzGB

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AF.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03AF.lmp
deleted file mode 100644
index 9c6a5d692387f4f9d0097267cfbba53da1abd172..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 176
zcmd;N;A3E5`2Syrfq}u8fq}t>fq}t|fq@~Cfq@~1fq|ixfq|iqfq`K@0|NsyQ&v`1
z)_+EptgNiatgQbGtXWw>k+C2aUshH)ND_|!Gw^}f(eW|y@$oS+F^O4O|CxBQvV!9i
k6BCo-qr>B20x>a(@$pIVa1}90AQef8@h~kQb71&C02ydF4FCWD

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03B0.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03B0.lmp
deleted file mode 100644
index 1cdb60417b21bbdfe5a929b0214224ede6dc583a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmWe&5M*FrU}ErKU|<MfU|@)3U|>jPU|=X_U|?usU|^WWz`(GYfq~&50|Ubi1_p)?
z3=9lxj0_B-j0_CQj0_C=j0_AGj0_B{%vm7tpOqymD>Nx9>pwF)h#wlCn3eUPi8CuJ
zGC3<CJQ~d7%E}5$%nAq$jRbS~v$BHXv$BGN0|R3~dO(_)Kn!-StgPVh=;-*wB#?=W
zELmAuky%+BoLN}`k&%&+F(B;>tXWw>k+BHj@bLJotp6b4aD*X|;n9(iU~xf^U}SPu
oR$zE&B+Nc0h?4@tA&Nlm4T{eS3<Vnn@ks!f4f0+f$Q+n|0Vf1uf&c&j

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CC.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CC.lmp
deleted file mode 100644
index 06c015e281c1b1c25aaf5c3f0bddfb36bb18ce22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 365
zcmWe);A3E5`2RnEfq@~Mfq@}|fq|itfq|i$fq`KG0|UcG1_p*h3=9mH85kIzFfcHD
zWnf@nV`N|uXJlZ|U}RvhWMp9QU}RtjXJlYVVPs%nX3EOS%KFd9l9iPenU%!`qCo--
zJXu*mk+E4>i7_!TU;*B&tnjR?q`=V7(9po7tgQbGV6DttSy=(W;o+gdfzer6|CxBQ
zvf{(TV`5?=g9GEC0>R-)AX~!2!2&E<SphLwSzJ*1KNFMz766+85=erofNOyY1gC%u
z1*u4cs0d923GifPg+``;Y>A8kIS%ZO=;-+P_{8``kO0V?F)=ZTNlA$@Sy}%<+@$cx
Y_@tynkbx{5Sy@?$iHV6IufhWX0OTQYa{vGU

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CD.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CD.lmp
deleted file mode 100644
index 36a7a2f82b5f1166bc89e7bb25d38503c6ed1c4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 304
zcmWe;;A3E5`2RnIfq@~Kfq@}~fq@~9fq|idfq|i!fq|iyfq`KL0|Ubn1_p*L3=9m1
z85kHYGB7aQXJBA>$H2hwkAZ=Ki;;mrl#zi!o{@n;gOP!OnJFtPE9*ZaOIB7^WLDOH
z2G*>spvYJ#D;zAzzy_j1ld`h@GqGl6g~lg>SZrBY0pZbLCVN&^KwxMjh|SEMl@%Nu
z7#IW6l9lzJg)1v7I6OK!J~0WTpOrH!D<Cp5GBO6F7{&_^kB2Lb43CbC1aUzo1%`)4
n!c1af&&mo6hsZIpWn~41f^~sh6aZndWMu_{bTTo6E&mSybBbN}

diff --git a/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CE.lmp b/wadsrc_extra/static/filter/doom.id/fonts/bigupper/03CE.lmp
deleted file mode 100644
index 51c1ffaa5b4dedef6a228b5996e8c84499c36eb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmWe);A3E5`2RnEfq@~Ofq|i%fq|imfq`Kz0|Ucm1_p*B3=9lc85kIzF)%Q^XJBCX
z!N9=4$;iMU#mK;*&B(xD&B(yu&B(wI#mK;r#mK<G%#@XtmBqyZBD1poGlCeASy^n%
zU;&VLOk!5ne+Is+tf0u)tgOVCn5?Wom{53DR#ISSXlQ6wKs-nl*f3`9tgL{b@bJ)}
ztN@TgCZ4RU`0((Un3#y5K#($!Ku~xR$cFH6umDR|RzM7rGnk+P|G|u;tSks45m^aO
zR#s?4GRTmK7_bVEHPO-W@$rfAi68-xJ7QvD5|ff3?f~(V!Xx5Ae2}dyTv=IJiHV6&
N|Dbyr<adzi{{fI$boKxM