From 9644e26ce33a41b50a63524299f9c317daeb831c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers 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 25658ff41e..be1dde8bef 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 zcmYL^+f4&85JjDJ2nmnnAyEWH&_f`K2Fpg4&1yg9gFpVLf+i?}8t8!%=)jzDkhr_Y zJ9F2b@m#wr=iK17tdCIP1>WEtKHw9+;2VCxFPyu9TeyQQJi{xDUQO-nh;^z&C&xq; z5wADI1!c?pK&Gox`#;rMcyJe&?>;$jw9SN-3GOHsHVtjKL5L!4M3=Eqr#fW67hogljAFqYTwPmhjIjYe$AC_9l0$U#=3QIWjpvM1ma9D+mi5IqFzt~-6nWLo~{ zW$Yh2_On|!=Nh-?6zJd`&TxS%e8Lyp;2VD6apK$(RCl^Z5k{mGQ-@BqZYM!8i{3^r1XT+2M)~F3i$h9d;=7+w2k`5E E0TQEt82|tP 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 zcmYj~F$#b%5CqStg_ZaZJ6mfXpoHT{L}GcRkMI#b!Y}G3L~vk^WwVfmIwCUE;|_3y z6ZG(aC%oVdOQYZ^DqKOJT6LB+rcRaP76*|6C1XsRkdub<%o#S-6D)Ob^Ptz OmI)#3dH4SU`FR1kzdUOI 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 zcmY+A!A%4)3`MiE3mgE!iWcaB9ykK4(I|n)QDhchkZ1vFKvck)A}E3$=z-xm+DKsO zjeh>vo}W1j>kz^aZg@s`glBkz5BP*H_=X=?FG4tn3%GlrwaAI~f-I_^J)griaI5iv1RJ7EGdlA{X*>)_C>D(5rT5Bm4e_(->s>-9aD`PR~j;6$IXo?8WYC1%#Dld6AXK1jz+8JvBWC;0~ODD{uwQfWp`btn}>h z__O0V&4?(a9YzBjIDs>`fGfCxJ9vO6c!4+gfN4Us086j}YmlWL)h0Pc4MBzXTfOg< zikmbD6AR1~+oh?3g2`5*90qA^4Lh57FV49pT#41@hoFuk4bI#Rl`>TpsFCNOL#e3V>`HES`NFr<BenRysQA%yoT*GyeluJfrYctnu eP{{2rF7=wQCMk{5V#$U80MUS@i}$;J;D5sT#j 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 zcmZvWu?@md3`Cs|6%ENIbhONnphQtDo&3`v@4ysH!4$M?^*JX|Dl9$Ax;xoENh2aj zF6>uwBX{y3Px2yf@*!VxNX{zh=swOdoZWj1ZLdXZ;S&^qs?si1z4{%@EMpo#Q5yGl eq|q@1WGvB8huE$;ve^&|Lj7}!fAEx-?XMsGZ$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 zcmXYp!41MN3`N}rRG?5cU>c5GN>!rBK~X9W$Rn@=D=-5KumCHt0xO{Koi@?4oM-26 zsUf12_NWJN0#|SYcklpD@B(k}0blR~O+mB+wGlmOIY;##ohemR6-s2Qrr4l&`u4VM z8HO5>qdTjxeHSrGv=*@3z@#KDQY3Lmp0I2!TV0 h5i)Od*5NQ~S{9Mn<2tJurWUzGtWQ5?t1)Xz`~$-xVQ~Ne 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 zcmY+9%?ScQ42834A5%>A(l9sCN~BKXfrr7xGfXLJAn 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 zcmX|*%MHRn3`8A%Clm=vpaoi>07A4{t!!k%(LK-uEzklj&;nPkTq$80C)tejEXVPT zcS|)9<$Oeq-~tTXz#Tlm6THA1e83m{098aAumgK=0P~qaxmutmG_*83rL%XnS@fTi z`jMG*E>-QYHCvkn6%kG`X&K;Km=l))i>ll7I&OGog5Q-_I37IAo5np;RUummuB9|JrIacHf2jK3ZRzH$&L`25A;9MvJGFroP MZREgt(tgU6KN)B^4FCWD 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 zcmYL^!41MN3`NtHQs@PGU;+l<$_N}2st{Q%s#?V5U)g{mSb{0of-%?tzEf3LdWroN z|JZ9&8Dmm&;Ax4FE4h(7d5|Z0kvI8}d1B0lY{`!7NuELDo6i70Fv$w7eb+Njmw;Sg zLldhKIQ6j3ODtEwu>QM`-ybIgVS)ev 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 zcmYk2!41MN3`Ijh2qECWg%wzV4LG($l@+xpO2h$q17=_eR$v8IUz8{FXmPk6x_rXyoEu!SA$LEr@AN{KX@a5~j#&O|Z`)q^{# zhQ9BMuv8V**tA3wb4js|=c=_8X>HRXR`|RKCTANz2v(@aE=6EOP0RU^Q}r*D9$COq zDt?whu&3NKSA=gxOD%8~Dhb-hh*($^s7+$VXoadSwPG&d*K}x@$ F@B!o@adQ9w 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 zcmX|+Jr2S!429ja1yLjx#LUWZ8cJkYDXLmAWngA!X6FDLfg5lFPQVQ~0^zx(So)mj z_%B(~f{0?=!FzB3M{ojXZ~<3v19$KMPw)b7@Bu|av;u3e0jUYFm}Kw*L3s#U+5Z&x zNt)>4I$Rp0UDK+^u6UB$blTmiJZxWT*-~x$%Bjr#w^H^tjL;d2uN9gXI$wG^aCwAU|8l} zbswpl8Q{7d5WNTLk0d~<8y?u8t~{)q0M>~#4pxoD6bK^T`_|QJQ^85n1d%K-#&Yg= zjp8lzxuEk^aN5tpAx*p2A+662joEHP2r)zzbPtBclwNyipQH`iYic#-+ZZ`C|L6b9 G-=rsyS#