From 1f1a8f60070fb6dea9b35c9ec3ef91d6307322f0 Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 3 Sep 2020 20:42:05 +0200
Subject: [PATCH] Personalize fonts

When the fonts distributed with texlive with same family name
as ours are also managed by fontconfig, Qt is not able to
discriminate ours by the style only. In order to be sure Qt
will load our fonts, we change the foundry name from 'PfEd'
to 'LyEd' and augment the font family name with this foundry
name. This only works on *nix, because adding a foundry name
seemingly breaks things on Windows. However, this is a *nix
only problem, seemingly.
---
 lib/fonts/cmex10.sfd                |   1 +
 lib/fonts/cmex10.ttf                | Bin 20688 -> 20688 bytes
 lib/fonts/cmmi10.sfd                |   2 +-
 lib/fonts/cmmi10.ttf                | Bin 32036 -> 32044 bytes
 lib/fonts/cmr10.sfd                 |   1 +
 lib/fonts/cmr10.ttf                 | Bin 26188 -> 26188 bytes
 lib/fonts/cmsy10.sfd                |   2 +-
 lib/fonts/cmsy10.ttf                | Bin 28476 -> 28484 bytes
 lib/fonts/dsrom10.sfd               |   2 +-
 lib/fonts/dsrom10.ttf               | Bin 9944 -> 9944 bytes
 lib/fonts/esint10.sfd               |   2 +-
 lib/fonts/esint10.ttf               | Bin 24316 -> 24324 bytes
 lib/fonts/eufm10.sfd                |   1 +
 lib/fonts/eufm10.ttf                | Bin 23476 -> 23476 bytes
 lib/fonts/msam10.sfd                |   2 +-
 lib/fonts/msam10.ttf                | Bin 26620 -> 26628 bytes
 lib/fonts/msbm10.sfd                |   2 +-
 lib/fonts/msbm10.ttf                | Bin 36460 -> 36468 bytes
 lib/fonts/rsfs10.sfd                |   2 +-
 lib/fonts/rsfs10.ttf                | Bin 10924 -> 10932 bytes
 lib/fonts/stmary10.sfd              |  27 +++++++++++++++++----------
 lib/fonts/stmary10.ttf              | Bin 18740 -> 18740 bytes
 lib/fonts/wasy10.sfd                |   2 +-
 lib/fonts/wasy10.ttf                | Bin 20876 -> 20884 bytes
 src/frontends/qt4/GuiFontLoader.cpp |   7 +++++++
 status.23x                          |   2 ++
 26 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/lib/fonts/cmex10.sfd b/lib/fonts/cmex10.sfd
index cea4d9d5a6..8431e86d93 100644
--- a/lib/fonts/cmex10.sfd
+++ b/lib/fonts/cmex10.sfd
@@ -50,6 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 0
 OS2StrikeYSize: 102
 OS2StrikeYPos: 530
+OS2Vendor: 'LyEd'
 OS2UnicodeRanges: 00000000.00000000.00000000.00000000
 MarkAttachClasses: 1
 DEI: 91125
diff --git a/lib/fonts/cmex10.ttf b/lib/fonts/cmex10.ttf
index cf8cd4ce9c2adc0f6dddef936c05ca7376e70e7f..af088f4c6e81202d4347b242aaa109fbe0a56ac9 100755
GIT binary patch
delta 169
zcmcbxknzGoMiT}`1_lOxh6V;^h5|RY5Z^T%SuP9=0b78gGVU&}ZVc)StAYF;AYaWt
zSl=i|#CzLB6CW1qHs64WEwPO16CWwbh^_vAD4yTuD}y`-P#pqXcqDmcvI65ICZEd9
xTNqp2nEM$-CLd%G-5luQz`@P~R4B$EH+fcotTY4I9SpbC0`d{s85lqY007J;C?Nm<

delta 169
zcmcbxknzGoMiT}`1_lOxh6V;^h5|RY5Z}4-dzLUT1Z)9{%DB6@x-o2FPyzCLfP4-A
zV11(;5&y*#O?+4c)U%@|w!|_DPkf{#)8#3l5YKP(l|h~ZsE&c*(!ts9Vf17L#z{;8
zX`8n&wz@G_Gl)z+$RfHq(8Ga)lMkpwf<b|SVe*UsSxJyP7|z%(IuD{@;KC!xD*%kh
BD;)p;

diff --git a/lib/fonts/cmmi10.sfd b/lib/fonts/cmmi10.sfd
index da3416ae5f..463e38aa9a 100644
--- a/lib/fonts/cmmi10.sfd
+++ b/lib/fonts/cmmi10.sfd
@@ -50,7 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 1175
 OS2StrikeYSize: 102
 OS2StrikeYPos: 530
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 OS2CodePages: 00000001.00000000
 OS2UnicodeRanges: 00000000.00000000.00000000.00000000
 MarkAttachClasses: 1
diff --git a/lib/fonts/cmmi10.ttf b/lib/fonts/cmmi10.ttf
index 9b2b430e5d9fae62ffeaafd4aa5606d06d279cf0..e7a7ac9ffb56d9bc4549b4758efa414a236c4432 100755
GIT binary patch
delta 347
zcmZ4Ti*d~_#(D-u1_lOxh6V;^h5|RY5Z^T%SqB&xY6XCzGVU&}ZVc)SYZ(}7UI6)O
z{=xc2aqh|H3=E7FKz>4UZel?_-;;X`49s7EVoAwmB??7SrMDRv*du^^v9yBpTqeOo
zi3|*^ApVW?oXWJzF8z%R44e%N4EZG)sfny97KSy?CblRG-e6#0lF7+WPW<{;D2IW8
zqhR6=c~79ROqB)s#U<(sHcw$-s4f5+Q&v!vS`e16Tnx0v0OTyN7Z@dHa_{^8AfDgm
zD}y`-P#6I&Jdz5StiTw_%)+vDat))Inop%`3c~>g1%@N6Oa8?$Ft9N&fmDM+f`Pe{
zwH!z(FfeYuz__rIxt~E~@<kTW&7IXTjO;u>88HUA$?s}prJ?F?s|DnP^uYkgG5|bE
BRY3p%

delta 363
zcmZ4Ui*d;>#(D-u1_lOxh6V;^h5|RY5Z_tZolOi3wH!cE8Fv>~H->EtDhv!Y4}g3P
z|6qNih_#7x85kHVfc&uJ+{A)<z9;t>7?|Gx#gdZCN)(EuN^dhTum=G7Vrd2GxlDqG
z5*Zj+LHrx(IhARbUHTgt7&w9Y^Gh;P6IoL@CHEUmY*7}xz`(#HlarsE`1P+)4g&*6
z#>5@+o<L)nDhu+9OVoQdPhnuF&Hx%yR#22$5SFi8475fA=nOTm7Z@dHPEWJSis!fa
z${-JNJp;pqr+R)cda?pzBr_wk#pD`BGr52?*AxZ^1_g#AtV{mIFfgz&FoD#8LIMaj
z-(Xx=$z07KGWj8k=;n#lF^u+nKw$}>dZ257su&sCfS3i$gXn_j1d}H_^9_MAaB$&~
GQ~&@(i&F6b

diff --git a/lib/fonts/cmr10.sfd b/lib/fonts/cmr10.sfd
index 80f8e565fb..641fe4dd2b 100644
--- a/lib/fonts/cmr10.sfd
+++ b/lib/fonts/cmr10.sfd
@@ -50,6 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 1186
 OS2StrikeYSize: 102
 OS2StrikeYPos: 530
+OS2Vendor: 'LyEd'
 OS2UnicodeRanges: 00000000.00000000.00000000.00000000
 DEI: 91125
 TtTable: prep
diff --git a/lib/fonts/cmr10.ttf b/lib/fonts/cmr10.ttf
index e405536e6d33d30c7d7b505a3b392b6d5f61768f..efff9fcf5982b44da2611bbbb6a877c775668362 100755
GIT binary patch
delta 187
zcmX?ehVjf9MiT}`1_lOxh6V;^h5|RY5Z^T%Y}XhV(hPv2GVU&}ZVc)SJwUzykT2&S
ztZx(-(BePQ#D~TFti+#*EwPN|6CWwb@b)>&#q-;IWsv6pszZPa54WXFR$!dO;#29G
zvUwZh?<D4a29e2%tfHGwruZ<L^8l5K0WlNM6^sn6K+FQ>K}-O-jN!IgKt6;EAwfn0
E0P&h9XaE2J

delta 187
zcmX?ehVjf9MiT}`1_lOxh6V;^h5|RY5Z_tZsxufE(hPv2GVU&}ZVa0lSb%&1AYZ{h
zSl=l1O_kzA6CW0itt;0}Y>8!5p7=;frtaL&1@ZhgUm4^%fa(|+E<9E4fzgu{7$>nf
zdHXVK-p2SliMg6VWU?Zw=;o6tK8)skKt&QDg$ztUcQ7)v0x{4wAP)pUE@L>^nQsW9
KVc^2UZD|0b4=ZH=

diff --git a/lib/fonts/cmsy10.sfd b/lib/fonts/cmsy10.sfd
index ad7e4839be..5ae7f207ec 100644
--- a/lib/fonts/cmsy10.sfd
+++ b/lib/fonts/cmsy10.sfd
@@ -50,7 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 723
 OS2StrikeYSize: 102
 OS2StrikeYPos: 530
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 OS2CodePages: 00000001.00000000
 OS2UnicodeRanges: 00000000.00000000.00000000.00000000
 MarkAttachClasses: 1
diff --git a/lib/fonts/cmsy10.ttf b/lib/fonts/cmsy10.ttf
index 40cb3a8cf0af3d28620faf6e8a8586b9357d2c94..de7089790db7c2fe8c176586a0b64eb87bc70f51 100755
GIT binary patch
delta 371
zcmdmUkMYPo#(D-u1_lOxh6V;^h5|RY5Z^T%*#Zm<`5Hh`8Fv>~HwJZvH9$U)%b?~T
ztZ$TjJ;8&4fw2O}Pe{&9EO?%m63)QD`~fJ|lU!D!;HBv5!oa`|l3$Znke<sVcqoy9
zfwcxGe<MAoGEKwoCQy#kgn=RPPDW}XYl_9S^1~Bblm%}vFfd8v<R>RCF6(w;VBk=h
zxI^9(=oF^Pg8br=twAa?85nYVfX0**6r~pA>uQ<;tqB2IqXhN>qvT93`FFG8`E9;3
z$a4UN5#YijsRff27$cckSZ7bJVKh_osdP<YIKZI5aF})3k01sHHf#2EK;@v2U|?-w
zEeBEx42+vEFz(G}?q?90%*ZOTc}Z?0qdgB$MvOs@feEOVk)aicS%4x;Kn&6g)(@j^
Os|A1q4af%rkRt%_0Z>Q)

delta 339
zcmX?dk8#gE#(D-u1_lOxh6V;^h5|RY5Z_tZotGFG@)dxhGVU&}ZVX!)R2UfYegOFz
z{=xc2akeo$3=E7FKz>+qZeqdnyp(VT2Idz)v7Y3z5(O_sR~H5b_5z^%nzVxSTqeOo
zi3|*^B|!Nb={c2Y8g@5<dO39%7!vPfq$aYaaPHgrc4CXN-~|Q-CW)N<<iy2g-A)V)
z95NGk$a``C1uF~ki%YiJsmx?x$ZY`{Q&LcrT9B`+X$rK)2WX8F*b9u3GpC+3TNTf5
z^OZp!s0|1%Jk?8u(UTPzBbgbQ%O}?`n#l#Exu!5UFeoq_W?l9ph=GC4ntdHmAt)q(
zVDk;ez1hsw3?h>mSw%Om&5dB><O2#z0M#>0=E;|p1gksQnQsVE4FeY*Ni6^X)ud9)

diff --git a/lib/fonts/dsrom10.sfd b/lib/fonts/dsrom10.sfd
index 9ab5bc2622..bf7e98b115 100644
--- a/lib/fonts/dsrom10.sfd
+++ b/lib/fonts/dsrom10.sfd
@@ -52,7 +52,7 @@ OS2SupXOff: 0
 OS2SupYOff: 480
 OS2StrikeYSize: 49
 OS2StrikeYPos: 258
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 OS2CodePages: 00000001.00000000
 OS2UnicodeRanges: 00000001.00000000.00000000.00000000
 DEI: 91125
diff --git a/lib/fonts/dsrom10.ttf b/lib/fonts/dsrom10.ttf
index 07db01fa7e5732407714de9d496202b436ca539b..ae17983e224f710a951f5f3edce393972b637c26 100755
GIT binary patch
delta 329
zcmccNd&Ad+fsuiMftR6yftew|%`L=tqUok41_re~Kv5ZY7gsk1bs%I=n*-#_`3LJ8
zg?YtjPBiJ!xRZRVpMgOcD9$voAiubTX)CiCP@Mr#T?*JtMg~XAB$34vU#w#CsoXq;
zQCz9spJ4%5iUCNn1MLM_4b;!T%qRe5GczbN#z5IDKs6JfY*q#V#$8Z08&Lc<(7B8(
zoIu_4fEdDNWZ+}?0A({VurYE#*~|=Xj3OYm0#E}B10N&EuOQ8=3<``hplmjv`02@B
wD)T45RtcDFqxzK(>@pz1!0>-7gVAI`X3@!kYQ-YA)dKQCg16Z>f~*JA01P5B$p8QV

delta 330
zcmccNd&Ad+fsuiMftR6yftew|%`L>Y`_J;z3=C>}fTA+)F0O72>Ojb#HV4R;^AFZH
z3iC=3n`qLb!PBzrG6RD$P@HK>L4I)wQ!}#}P@Mr#T?*JtMh3^n-#XV!e6fltAZ_y$
zMscP30ER_iDFz_P&d3a9GchnT3Pah<49bl0P&Nxt&15K>l|g`UFO<y&6u$>_E+Y#k
z(6R+U3}G`e@G*RbvY8mz7`dTrW(GG#aS&SpsDXunkFgml!OEb(I2+1l1B#!U?4>fF
vQDO26l|UeAsrr?h31~PF{BLG3nk>jHIyq3SSmf$k*Bv0i+w2=b_Je5vDM2;J

diff --git a/lib/fonts/esint10.sfd b/lib/fonts/esint10.sfd
index eb0b568859..71a4fe1c51 100644
--- a/lib/fonts/esint10.sfd
+++ b/lib/fonts/esint10.sfd
@@ -50,7 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 0
 OS2StrikeYSize: 102
 OS2StrikeYPos: 530
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 OS2CodePages: 40000001.80d40000
 OS2UnicodeRanges: 00000003.00000000.00000000.00000000
 Lookup: 4 0 1 "'liga' Ligature standard in Latin lookup 0"  {"'liga' Ligature standard in Latin lookup 0 subtable"  } ['liga' ('latn' <'dflt' > ) ]
diff --git a/lib/fonts/esint10.ttf b/lib/fonts/esint10.ttf
index deb6e5fe97d783244bdfed66578efff832925528..60535fd66c0b704b83ef08867f979f330d551e34 100755
GIT binary patch
delta 1132
zcmaKrYfKbZ6vxk<*Ii~9yAeoHSHRcsNQIOtsiFoEmnd#QKv3JDgvXL)7Z!H0-L#Fy
z7-LKmyIvnj4Tjdl=m)FjMx!4z8ik;rY-5ZG&Q@2g#F(H>ny`jtJiA?N<A=_Nx${4d
zU(Wx`%+xiq?>gBH1OV)KlK`B~Mwf5!+Y10K;}~^RSFLwKhzy|4LtR>3SKHtX2M?hh
zMV(jOu%&WrZ=?%#BkEvnLrJOoR*3*W4xrxI=4<tr<}aTHkS75IXWOn|o;;|I0oW=q
zU+iuTZ1Y<dhzQ8WfX(d<buQ0dR1ctj2T(KG)zR8cZU)aFFdg${T^MlWigl=~P%rNC
z1;2ScN6$b#jt=bJ-nQ1$wc#m5`NI!$cVLll*54Zlo;or3E5O#*IEj&TOkl0_{c*>R
zk5>H+xi(}0+&pSumN@T4=cQZbq-kHNxlq~w{Uk43lIEH;;fn6C%&B_&O4dX^6D7sV
zejsJWrqKF!xPfp>>74FNl+r~NIM|;1sdii#i0m=>cz3tb4+FFbd}$8wsVksI8-ak1
z&oieu0v@R!5_MjzbAPC3>So9@d2z&wO8r*k18t)2L!KLXJ+x^y_%N^$1K!l>;bGxR
zkqrrH{FVG%lHW*Alo#xQI!wD`MU<%)`$e0O|DuPLSNvG|IYNE00yU^feB-P;DB@4l
za?H%NUljD7Sb^TGN$>?6hv)23PBB+9m>@q(|3ew)C$l<4>@C98id>y@UQETWJ9OcF
z{P!G}pnKvkr5B0`_3#z=*u6D*eA9wlqIbs($}|z$VF30se^nEksL1AjE?hyVHy))w
zDlfUQ_)~$pW2)-M`C5$C;(JyHcp-qS`Fyyrn4q;Ji@z;0|Lu-^vLVr(uliMs7nhX(
z?}TzcPS^>4IDyn0{<iGr<b<{bIAI75!eyMWkpK4iG)ar5{B*FP%5{8R`5vN2QeHwZ
z1Q)TgnOm!F6N=8|KE>pB*IfFCW*{v9``~PncBvvtXo|*9Rt^(trhIs+vIN=}e<M9p
z9`pT9ouH2;^oSbcKUMb;+JpOH%2Pgj!*F8P2EIR$M{2$n<q26;B7A%8Ra`@?kRH)o
zeD3C5M2SDe#3O#JeyKn`lO{c^0l(XrFNudBlZAy$Zrhe6)5MRt5Q>=5lFw>d1~bQu
My57Wh`QP8^9dQg`2mk;8

delta 1100
zcmaJ<TSydP6h1SvGqX;PZedWl<&`9|Eps(93p3p<Ei^SN2*tK`7c$hHQ8S?;f-=k4
z2450=NC;XgjQ^#eq8{85x=4hG(z@L&=%L6~oN(RFtZPOO&BK4@JLi1gcmB({N7T$i
z>NHRQV8BHOV6jy0IRw{S0M&lX8m)yz7U~o<BVLBsY%MFTsB_C#5I;toXsy^+Fm~4G
zM7$fZTw1YyqoX+80YF_qTxC06+psY$YZie04nSLM&2l2!Ba8v)bFgl5)Jg{%LLp#K
zz<>$8qpsDSwLirMAjkkE&zwhVk1US8(Sd@|SkHE1BHqjNAudFm>O3x=_`X~WAok-9
z40ZLk+8d?r8I*FmM-poC(Di0Ry(IUY@3{kT;0sQ&I=o{Fw(F~Zy|0PQ3qXP%wE%`b
zncVX+<Wn;ZW?>q!9%wC#A0CpRsvF>*Xbkyg$_-|vippdtc%WROvQL-Ui;h4(HibC*
ztQ}jYxfl6JI`c;3GR>e(475jE5qqIg=K>e!f+oHS<R~LZ!e)>cc|j8Ke?DTLgnd$^
zukBwv-v`z?T}?PlV7#GEI#<a57yf|QhuDRJttcp=aTDTV%^(tG;-+m3nPew)?4<4;
z_gwJ_1H4Pk<Sz?Tif7R`c9L)B-jLqt+Y~RWnZhyQ2Puykq<AS95VE*Yl5Dt3YZb9f
zm?EP~p3>sa=y7fYx39owYOOM4%q3rzrZBNm_=u;V1iG-0q4<}W$j;@h3_FYcFNxPE
z(tM<cjIP>)AgJobxnW{TDndJT6W@W}CzElIrl87q;8dp644Q9K&4LrX?W?yke>k2s
zdlxwL+P4dwiS%9boN1E1e#?LT*#`9YWe<e4^efTdle3QIKSn0=<zmGjnaq=yM2k2x
z+sF;WQK$z+>0h&w1h!qBW5*-AGk-B1^<j<;4#l6lgM2MGLy5jQ4QPRGxTW;x?I*7a
z?@_!fIH~h<uSusxr1(}f7cXU+T(>r&U@(C9GD24D8ld?myq7wxOq8@RY=9Lof4KC%
z=9<M{6vj#N-e!uMWy6Kua-3gQi}5gjlGl}KI;IWc6gM453<sC8Q8D<eQXw5cNv}>*
Z_EmSs4Yt>3Xm9OFm%*&Xq4)98zX6TDWsLv;

diff --git a/lib/fonts/eufm10.sfd b/lib/fonts/eufm10.sfd
index c80451aae4..7082f5e8d0 100644
--- a/lib/fonts/eufm10.sfd
+++ b/lib/fonts/eufm10.sfd
@@ -50,6 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 1239
 OS2StrikeYSize: 102
 OS2StrikeYPos: 530
+OS2Vendor: 'LyEd'
 OS2UnicodeRanges: 00000000.00000000.00000000.00000000
 MarkAttachClasses: 1
 DEI: 91125
diff --git a/lib/fonts/eufm10.ttf b/lib/fonts/eufm10.ttf
index 0e670d4635a5c491a17b5662901590a85e6a5dbb..da7d5c3b2e72345c197f2ed76f35e1b26a032de3 100755
GIT binary patch
delta 197
zcmdn8opH-{MiT}`1_lOxh6V;^h5|RY5Z^T%*(VtoqGtd_W!zm{-5Asv+JXE6AYaWt
zSl=k_NYed@CO#|{{wd`XTVff{PJE;!^D0BBGM?Y&D}y`-P#pqXcqAP;S%GnqoKK}|
z3c~>g1%@N6SO3{FFtEO1JPlL^vYUbV&E^Y?oe|9a3?h>+GK+35jACJA=K)HHG007>
Ti<Xs!s=KWgkPlK110cfze?l*&

delta 197
zcmdn8opH-{MiT}`1_lOxh6V;^h5|RY5Z_tZUEK@}(KCReGVU&}ZVVF`RDk>fAYa2j
zSl=iuA%bC|i4O~>`LdjeEwPL{Cq7b=iGE++8_#d^l|h~ZsE&c*!c)EFFnY2A<0LsJ
zZ(jz60}KibM_8}^vu9vneZzPfr~qU)1GDw!3yhr+%+(AclP@xhZZ3>sVdUfkN=N|J
ZGfb|DmX!pnJK33U2vQFN7amDR0s!9LFrxqf

diff --git a/lib/fonts/msam10.sfd b/lib/fonts/msam10.sfd
index 20030cdf29..4e21436d08 100644
--- a/lib/fonts/msam10.sfd
+++ b/lib/fonts/msam10.sfd
@@ -50,7 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 0
 OS2StrikeYSize: 102
 OS2StrikeYPos: 530
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 OS2CodePages: 00000001.00000000
 OS2UnicodeRanges: 00000000.00000000.00000000.00000000
 MarkAttachClasses: 1
diff --git a/lib/fonts/msam10.ttf b/lib/fonts/msam10.ttf
index 3b0cd89d0bfebd33864c70560a2e4e62eedcb124..3eaad5ae315d7f1ac58a801ab6d7439fe30c6efa 100755
GIT binary patch
delta 371
zcmex!p0VWuV?6^S0|Ns;LjwadLxG!Hi0>MX91#YF^cO%;8Fv>~HwJZvH9-CWAYaWt
zSl=klGi?C_17ih{pOBoJSnxbAC7gkQ`2$d_C%LRdA)M0($YyT<%6Fs{q~|gT9!g|j
zV66el-$>7?Oq*gX$jrdNDZ#)HwIU-mku}BY><pEOEy{v77#Nr&a`KZCm0fr*F)(m&
zOxz*wc>pNbU65Z~vNcF$CIds7573yBf}+%d9UNyYf!2fot<eH|fzjAlxaj|~cz&C&
z4DuX6VFbAFNP5X+1;$8b7B=<CHH>CzK9#O13<nq#7!Gr={qX|Y#m2l1s2mg$46MB@
zAVU=x7&l*FtW9C=XAqgp$SSfqB`uQCo(Cu+#vsSQ1XRn&&<eyXKoKS&2I&Rshtapy
M0`h@uH~={U02{(j8~^|S

delta 339
zcmZp<!1(7pV?6^S0|Ns;LjwadLxG!Hi0`cIu4@bo=?{RSGVU&}ZVX!)RDk>)K)!~5
zu)a~`rQ~}I42%^(epqsDV!`vglyC+H<`+P*p5(F;g>X)v4-5?KAo-58g7jP_!9$4*
z46G$U`5Wmum1$Fq1(_KbI0YCOqE=+2CbFh*Z@u|tVvDli1qKEtiJbi8L}eG=OAHJg
z3=?<AdjhRx>MqDHF4=0QGLwNJ%>`&oNkLI+!48fymOyKKfYxY%y})Q}Jm;EgSv<eZ
zR|a_wpfCf&g{OMEVDw}K#z<yH*0#wtjAn8HX|5>@4h#wmhdJ2(cmeHVW8MZ-2nq=x
y*nESrHifyGL1Z!`tLWz3v<OB{KA^A!P(8!sGwHIDV09-u^9@0&Vc^0e=_LS?nN(H)

diff --git a/lib/fonts/msbm10.sfd b/lib/fonts/msbm10.sfd
index de6db2784f..2453f50cab 100644
--- a/lib/fonts/msbm10.sfd
+++ b/lib/fonts/msbm10.sfd
@@ -50,7 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 721
 OS2StrikeYSize: 102
 OS2StrikeYPos: 530
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 OS2CodePages: 00000001.00000000
 OS2UnicodeRanges: 00000000.00000000.00000000.00000000
 MarkAttachClasses: 1
diff --git a/lib/fonts/msbm10.ttf b/lib/fonts/msbm10.ttf
index 04a4717d64a6f3dd64bd24a3146de54d8e6d8c15..dd7c2943e928fc8e98461391b2324f654ee2a4ff 100755
GIT binary patch
delta 369
zcmaDehv~~4rg{cO1_lOxh6V;^h5|RY5Z^T%IYA5zeGx!W8Fv>~HwJZv<v_jxkgw(+
ztZx+GoNB|sz*qs~CnV=47I?Y65NBXuz5^7SlU!D!;OFM~f`Ne@B;S@+ke<sVcqoy9
zffdMSypf($nKtoTk`@C4Ckq2Zqe(_;B5R6Mzzm^@Ey{v77#NsXa`KZCAJ1Y@V_@K5
zn7BjU(*h{iU65Z~qWo&h90rD-BS2%a3W`z-R`MTk1zHmTau(PNjK;=m4u4jQ=ePOF
zAkP65Mt}>Cq#sRIV2osBnOwzaq2^QRn!<2^L4n~g>!LqPfQG~{#{d<B!hwP1I%_qM
zQea@*e1Y+67jr*@$mEYKqMPsb1Tfn30A<7&<QSNMY8inc#>fEl1&{~P3)T;1Gu&1S
L$Op3F0OSM!lyXx&

delta 337
zcmew|hw056rg{cO1_lOxh6V;^h5|RY5Z_tZ-69MOeE~pG8Fv>~H--%iDnPylkgwq%
ztZx+gH2ER}17ih{AC{b(Sm5RMLY#qt`3g{MPI6g^f}fk`3kC-E0-$_bT0wd)li;C5
z1_o9jpYcX|PG#D}Z%JAV3><$L7#dA7QWIHIge`6!nb@K%c!7a|i6tjLIq~r<7B!#=
zKPK*w_cQ<sb{FIqmndJ`GKYboXAjVrtb(G{f|dLST!D%_fYzviy})Q}Y*BAk70++;
zl|h~ZD9pfc;i=v!7(H2mF_MvSauuV6TtJ#@3WEcK0>fd}MSqq64T)in0V)H90}yP!
w!T7a{xtc*_G9#<#=BGUYjGTNxVF{pmhRHU4vXWqRCp+^EL8@Wk!XxQN0PfjVBLDyZ

diff --git a/lib/fonts/rsfs10.sfd b/lib/fonts/rsfs10.sfd
index 8206bdfd87..b28f6f411d 100644
--- a/lib/fonts/rsfs10.sfd
+++ b/lib/fonts/rsfs10.sfd
@@ -50,7 +50,7 @@ OS2SupXOff: -101
 OS2SupYOff: 490
 OS2StrikeYSize: 50
 OS2StrikeYPos: 264
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 OS2CodePages: 00000001.00000000
 OS2UnicodeRanges: 80000001.00000000.00000000.00000000
 Lookup: 258 0 0 "'kern' Horizontal Kerning in Latin lookup 0"  {"'kern' Horizontal Kerning in Latin lookup 0 subtable"  } ['kern' ('latn' <'dflt' > ) ]
diff --git a/lib/fonts/rsfs10.ttf b/lib/fonts/rsfs10.ttf
index 4160bcf70430e4e61ea3c1db012f52c4b0233b5d..4b17608215b0ad0d7b10f2de8909689ff7e76101 100755
GIT binary patch
delta 447
zcmZ1zx+S!pfsuiMfuEs)ftjJe%`L<?Hm^OHfkA5qP*ld<#np{Loxugj2XYzI+ynfB
zZ-_nj1@b+B`~dghP^X-UCH+9Y29U4dAFOW_CH7|z0|R3Pke`s8n^>@6oy!~s2BrX@
zm{)pYal!xpK${pee*on<(sL?3)28ti0ZnJV!@!_ik&&91@+`LUI#BWt5SwKH1vmm3
zdx4rwfP9sV+>(kY1GY;*{tY0%A}2pNu_d7T1W^B+i6`VOLx46p6yz6|<SbxQ1KKhL
zs3-~SLq-P2^RWV%@%%Pl8Ms-1!VC->)1*>B^o2(<^^+ACBN<sHS20?s`Bb{5Ff=ka
zDmXA3|2JlcVS34E3{(XQCLmzC2P702m?mFf6laxUmSAw${D$!}3%k_+H_Y}-cQ!v`
zb7f?7*sQ}bmyhxL=2K$QjEwg;KNCOC#QKi8hw1+2T~fFCn71$(Pu|ERI(e;TfFcjj
nJTV421}2~lj100s400V45QA(4;>mJaRU)_50`h@e6gL9^wnJ=v

delta 437
zcmdlIx+b)qfsuiMfuEs)ftjJe%`L>&`{FWD1_rGOKv5ZY7gsk1Uj`Kh2F)KpzJ_~%
zfA9^l=e|IB2OvMdJvh`UXJSb|kgovbEBFWN8-<H8s53AyRsi{7$+?LI8`inZVPIhL
z0E&5~Cl(j{{|~f@LGuGpo+CY{(lc!uUy%+21M?LI2IY#3)Wj6l`wR8}CI0}iSq4ym
zBapEdsM!R_SINjNsfaRQ1FB`b0OVKX<R>S#1XP~@>Yp<4guJB>&?bk1{Nj?F95ywe
zEj>U*Nnjr`GC1zsP<J<;-{va=Hw#dhf#Jeay(chwvI1iyBje;MMhmNeG}jcM7DojK
zX5;_H3^7bE8I6I;K*0o}LJ%~w8G{P*LI!1~l?>9%5)6);zc7AgVVC~@mf4=^_U3nN
zu8fS1n@u?8@-hC{d`V22k@4Q<cjD)nSl=`EFx}gHNa{8pa|46%<bzD2lecOHaPk37
jmS9j|V3^FKB|TYFt6bz{XTBlGx{Ya4DIog7Bbj;tL$7Xo

diff --git a/lib/fonts/stmary10.sfd b/lib/fonts/stmary10.sfd
index f1841d9a06..56637c844a 100644
--- a/lib/fonts/stmary10.sfd
+++ b/lib/fonts/stmary10.sfd
@@ -1,4 +1,4 @@
-SplineFontDB: 3.0
+SplineFontDB: 3.2
 FontName: stmary10
 FullName: stmary10
 FamilyName: stmary10
@@ -6,23 +6,30 @@ Weight: Roman
 Copyright: Copyright (c) Taco Hoekwater, 1998. All rights reserved.
 Version: 001.001
 ItalicAngle: 0
-UnderlinePosition: -102.4
-UnderlineWidth: 51.2
+UnderlinePosition: -102
+UnderlineWidth: 51
 Ascent: 819
 Descent: 205
+InvalidEm: 0
 LayerCount: 2
-Layer: 0 0 "Back"  1
-Layer: 1 0 "Zeichenebene"  0
+Layer: 0 0 "Back" 1
+Layer: 1 0 "Zeichenebene" 0
+FSType: 0
 OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 0
 CreationTime: 1302307949
-ModificationTime: 1421634721
+ModificationTime: 1599145907
+PfmFamily: 17
+TTFWeight: 400
+TTFWidth: 5
+LineGap: 92
+VLineGap: 0
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
 OS2TypoDOffset: 1
-OS2TypoLinegap: 0
+OS2TypoLinegap: 92
 OS2WinAscent: 0
 OS2WinAOffset: 1
 OS2WinDescent: 0
@@ -31,17 +38,17 @@ HheadAscent: 0
 HheadAOffset: 1
 HheadDescent: 0
 HheadDOffset: 1
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 MarkAttachClasses: 1
 DEI: 91125
-LangName: 1033 "" "" "LyX" "FontForge 2.0 : stmary10 : 17-7-2010" 
+LangName: 1033 "" "" "LyX" "FontForge 2.0 : stmary10 : 17-7-2010"
 Encoding: UnicodeBmp
 UnicodeInterp: none
 NameList: Adobe Glyph List
 DisplaySize: -96
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 0 8 2
+WinInfo: 64 8 2
 BeginPrivate: 0
 EndPrivate
 BeginChars: 65539 131
diff --git a/lib/fonts/stmary10.ttf b/lib/fonts/stmary10.ttf
index bafedc43b1ae92d613584c1e2c01c11671ad675f..a380b37e34a5e4fe89f06e38a5e6b49700a7815a 100755
GIT binary patch
delta 313
zcmdloiE+y$MiT}`1_lORh6V;^h5$FW5Z{KR*a-{_o)SP&8Fv>~HwJZvRSXOsAAo!{
z|6qNiIJelV6HRnPI{0_}U|?Vas<Z6LNKH)P5cO1^SQ4whze<yV!SN4J>Lu7{Mh3@E
zzq;7t`E9;3aI*kSVPH6UG~_LazFoG%coO3z7N1Jjl+Du^+k}}|`6tVX&Sm0ep1fBy
zfr*8Ev%DCKthgM5A_D`Xk(daZvZAO6JDakSx~iJG+GI;(1ubSEU}a=wVdG(C);z{2
z!Xv=b%*x8eJe`S^g`Jg!g?TzN7b|OX`?KQ7Eym$YtW2Bl8f&mHaqw<txA@1&yoJGd
l@<bNV&9Y86*w}f1ZW3dVoBYp1RvKs_*okTZ`5+qE$pB%CM<xIO

delta 313
zcmdloiE+y$MiT}`1_lORh6V;^h5$FW5Z@GohYk!3o)SP&8Fv>~H-^m&Dhv!BAAo!f
z|6qNi)JMU~Cz|Mpm^Z5{Gcd3L)miprq$Z}YES~v$Vo9uica<gsgX15d)Jw3@j0}#4
zi{#kj`E9;3aI*kSVPLrMR1YW*p(im;VsY~JW!OB8u}zqXMPRa==v*c)mdSfX6PQ@p
zHp`2#$co7_C@?TE8i|RpDJzPKu(K&EsjKQSPPQ^u&}L(1W@Th$VdG(C);z{2!Xv=b
z%*x8eJe`??ot1?JNOQ5WHn%@32HG~c#W<Xag?aN`V+|H2cD~K*7XLVz8yJiyPh=6@
oEbDZGjgt?kN&;lp<Uby=lAv&5IN6zR2&RvQyamx09?2>K0PrS8B>(^b

diff --git a/lib/fonts/wasy10.sfd b/lib/fonts/wasy10.sfd
index f70df41efa..10468b5b00 100644
--- a/lib/fonts/wasy10.sfd
+++ b/lib/fonts/wasy10.sfd
@@ -50,7 +50,7 @@ OS2SupXOff: 0
 OS2SupYOff: 0
 OS2StrikeYSize: 51
 OS2StrikeYPos: 265
-OS2Vendor: 'PfEd'
+OS2Vendor: 'LyEd'
 OS2CodePages: 00000001.00000000
 OS2UnicodeRanges: 00000001.00000000.00000000.00000000
 MarkAttachClasses: 1
diff --git a/lib/fonts/wasy10.ttf b/lib/fonts/wasy10.ttf
index a4e32d20eabdae944e2c2a84d4b5547207a9f002..feebb218f87363ee20a61094b2fe0b9378eb6a5d 100755
GIT binary patch
delta 355
zcmeBK%s6E+V?6^S0|NseLjwadLxP)Ih;Qtio;?f<ffYbe8Fv>~HwJZvH9&p<kgw(+
ztZx*@mXN~0z?cE#CnV=47TiskH-~|N`36udD7maefkBC>gMoon2Pn^yo>*M)|3A=V
zhCmM>pCdh|GVRXNZJ!w!*c=!boTp@@CbFiyD5_dMu|-+%1Oo#TUrv5<qV^l9S3naC
zChm~8yaF`#eL;S4NzaFbR0am`BS48}u#*`XnkVeP=n~Iw^OZrK1!y`0!^SCcK#dFx
z7aqwbO%`B`WM*M{JUNHaOwFg#HHF~-P+L8-@qc5WYungX1J!|i&cL*YsR2kSFfeXD
zz{u*we3rp@@<tZX&3C;ESnYX$GGYvJ3`{_^j0~+n46=y{h(UV6`eF2KwSase8^sX-
DR_9Zh

delta 323
zcmbQTn6YOuV?6^S0|NseLjwadLxP)Ih_Cnm)pZOEfdxQO8Fv>~H-@bYDnPymkgwq%
ztZx*ZoH&btfiVNf4@=HXEV!F6Zw><k^97(-P;yy`0)rA$2Ll5uP!9u3dSY?G|NlUf
z83G-Ee2(;-%CtL6w|!<{V6$LgaGsKpn#h{Mer!(j#1>`20}KpId^!2aiP~?ZUI9(e
zn7BjU@(j?}_XYXIB|Uo+QW+S$_W&iD!A@pmXs&$d&l1mX^OZrK1!y`0!-c2%A~1Tg
z0AnOGBeVbH97Z#_fHc<>1_z+FdS>JQ#z5D$v8@Iw1o<2YHlJW*^<tjIU_5yvi|FR3
o-UY0jd_Z9d1_cI&$uWVll3;ZwJM#@esy9xN1G)}q*(2E`0J~>UQUCw|

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index bfc215d376..24e5e9b7b6 100644
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -189,7 +189,14 @@ QFont symbolFont(QString const & family, bool * ok)
 	upper[0] = family[0].toUpper();
 
 	QFont font;
+#if defined Q_WS_X11 || defined(QPA_XCB)
+	// On *nix we have to also specify the foundry to be able to
+	// discriminate our fonts when the texlive fonts are managed by
+	// fontconfig. Unfortunately, doing the same on Windows breaks things.
+	font.setFamily(family + QLatin1String(" [LyEd]"));
+#else
 	font.setFamily(family);
+#endif
 #if QT_VERSION >= 0x040800
 	font.setStyleName("LyX");
 
diff --git a/status.23x b/status.23x
index 552ccd7968..cf4d1b2d7b 100644
--- a/status.23x
+++ b/status.23x
@@ -32,6 +32,8 @@ What's new
 
 - Allow creation of a child file from the include dialog (bug 4475).
 
+- Make sure to load the correct math fonts in certain cases.
+
 
 * MISCELLANEOUS
 
-- 
2.39.5