From a9afdbb73c7ee568eeabd2848e9996322e4d5c85 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Thu, 3 Sep 2020 17:46:30 +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 27700 -> 27700 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 | Bin 126101 -> 126101 bytes lib/fonts/stmary10.ttf | Bin 19172 -> 19172 bytes lib/fonts/wasy10.sfd | 2 +- lib/fonts/wasy10.ttf | Bin 21292 -> 21292 bytes src/frontends/qt/GuiFontLoader.cpp | 7 +++++++ 25 files changed, 18 insertions(+), 8 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)lMkpwf4UZel?_-;;X`49s7EVoAwmB??7SrMDRv*du^^v9yBpTqeOo zi3|*^ApVW?oXWJzF8z%R44e%N4EZG)sfny97KSy?CblRG-e6#0lF7+WPW<{;D2IW8 zqhR6=c~79ROqB)s#U<)Jo2M`^R2Kk^DJv*SEeOk3E(Tg-0CE=C3yhL8#UgqA;`wd9 zGRSiPg%RMwBdLJN3XGA=EG%0m*D#u?`Bb{5FdSe|U^v3Mv1LNikjH1=-JV1^ZgWTkIHL}uBC0F0N?f@x;0g(9sy`@i; delta 350 zcmZ4Ui*d;>#(D-u1_lOxh6V;^h5|RY5Z_tZolOi3wH!cE8Fv>~H->EtDhv!Y4}g3P z|6qNih_#7x85kHVfc&uJ+{A)7?|Gx#gdZCN)(EuN^dhTum=G7Vrd2GxlDqG z5*Zj+LHrx(IhARbUHTgt7&w9Y^Gh;P6IoL@CHEUmY*7}xz`(#HlarsE`1P+)4g&*6 z#>5@+o&#q-;IWsv6pszZPa54WXFR$!dO;#29G zvUwZh?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..2544757e76b78b16eae42a17446f5910bf67a404 100755 GIT binary patch delta 358 zcmdmUkMYPo#(D-u1_lOxh6V;^h5|RY5Z`6z6CxQH@-={>GVU&}ZVc)SYk+(pmqE=x zSl=l5dV&W717ih{pOBoJSnxbAC7gkQ`2$d_C%LRd!AsHAg@J(`B)=xDAU&5!@K7QH z18WUX{ziIEWtxWFO`sg72?Imoos85())b3t<%cJ>C=1?TU|^ES$xlvPT-NQxz`&t0 zafiI808p^9Aiua|tDVYB28P@opfM!{MX3e(x|*gyYeIn5D1p7eC^=JP7Yj!`zs*+$ zc@Cg30$g|`wP3OWV+H!jjAm*+m98la2N)C>4zn)%5yZg2X3f41s2mg$46H4z zb-fpPN%M%`R{9w0}IL5_h5D9y;w3dAfx5hfr8DF+qZeqdnyp(VT2Idz)v7Y3z5(O_sR~H5b_5z^%nzVxSTqeOo zi3|*^B|!Nb={c2Y8g@5SSlWAxHrXTzDk4003r`PS^kd diff --git a/lib/fonts/dsrom10.sfd b/lib/fonts/dsrom10.sfd index e2539ceb15..ef4958f405 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..aba22e34f4454df70fc9d6b789d120417acf25f8 100755 GIT binary patch delta 26 icmccNd&75v5mSujM3YTS6Wb=fSjFU1xp@ksiz)z^;0nJ0 delta 26 icmccNd&75v5mSQLM3YTSoogn(Sj7~Ows{Jpiz)z^;0nJ0 diff --git a/lib/fonts/esint10.sfd b/lib/fonts/esint10.sfd index 9cc4a6f3dc..97f31a804e 100644 --- a/lib/fonts/esint10.sfd +++ b/lib/fonts/esint10.sfd @@ -51,7 +51,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 8626dec2eaafff786cad270302e282bf57e51b8a..87d6b540474d3e36ffd2435f79c0be7f51d69f42 100755 GIT binary patch delta 72 zcmdmTgK^6ZMqvg<1_lNJAi=`G;N}+Mn->*6QP`eI-*jTg0T%Y{`->(^Fs@?qsoZ>o YF*Zy1t?Le;a)yIb1x!HnwHr)40KVoFAOHXW delta 72 zcmdmTgK^6ZMqvg<1_lNJAi=`G;N}+Mo2Te9QP`fzSZQL&0TvF;yE7(BFs@<>NZWjb YF*Zwhi_s3Ca)yIb1x!HnwHr)40G!_wApigX 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> TifAYa2j 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..cb2db1ddc3a136bd460f8705b2116ff54ad67fa8 100755 GIT binary patch delta 358 zcmex!p0VWuV?6^S0|Ns;LjwadLxG!Hi0`uViLnd}=`VnyGVU&}ZVc)SYk>R%K)#xP zu)a~8XW9Y=2F3~?KOs3cvEX@LN;m@p^9P_rzlMmTa*QFFfcGl2~0dm9`y2K=uLv2Tx3Q delta 326 zcmZp)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=?MqDHF4=0QGLwNJ%>`&oNkLI+!48fymOyKKfYxY%y})Q}Jm;EgSv@4h#wmhdJ2(cmeHVW8MZ-2nq=x l*nETWZ7L@pkR<_B!Z7(vx~wEv>SSlWAxHrXTzDkC1OQ8kQK$d_ 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..5c92808046defc904b3d0b9bcbca8dbbd2896501 100755 GIT binary patch delta 356 zcmaDehv~~4rg{cO1_lOxh6V;^h5|RY5Z`6z6K69p^hE$gW!zm{-5AsvmIL_)K)#xP zu)a}zbE*vk17ih{pOBoJSm5RMLY#qt`3_KQPI6g^f}fk`3kC*ukbGNOL3%Ee;GskY z238=S@kV-1W!l7VNm>jHoGc6sjV2kXiL5D30W*XqwkQkUU|?Wk$;nSnd_0Rqje&uK zVd4&XPYa-6cR_w}iSo5Aa~K$UjsT6xDkw@VSjm6D6=+QW$XQ@7Fd7?gkK>pU&u{aU zL7oFBi~tuNNk5vbz!=HMGP#P;Ld~brHHF~-g95{0)9z;1<3zW@p^{wj;AR7)qwgLb`IZp}z delta 324 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_cQfd}MSqq64T)in0V)H90}yP! j!5G`a$p>Uf0F^LIw&|0V1WTRl%r^unfPo8-q#pqQQ1(&S 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..4559b85ec6dc662f9ad1ddc2ad1623ca8848244c 100755 GIT binary patch delta 435 zcmZ1zx+S!pfsuiMfuEs)ftjJe%`Ln)hI)e+459Bhaxd-?M z-w=E53*>tM`2p_1p-wpyOZtI)4Ip2^KUm)=O6<=b1_s6oAU`2FH?d&DIv1dMOaVYK zuk^&?g8%=4HZf@a0LpWu=Tv&8P2(#9n$CQOfkC+7Ca0D{; z0yUce`6?N?B^6NyY?pxi8$fUGO|prVzf~6sdP6y za9}q6Z_E(G^pepSs0tKJK)`elNGLEcO}@Y=&ML($!Qim@4dZ7PcB%hwnC+SFY<|Y( z%E;)jS%+gTALIAUr^KWg8Sig?CVrlY^&N8$)BVl6q@4K`d4Oh!F~~760ZnCOkOg9p Zi6P5?K2X&V3l delta 425 zcmdlIx+b)qfsuiMfuEs)ftjJe%`L>&`{FWD1_rGOKv5ZY7gsk1Uj`Kh2F)KpzJ_~% zfA9^l=e|IB2OvMdJvh`UXJSb|kgovbEBFWN8-S#1XP~@>Yp<4guJB>&?bk1{Nj?F95ywe zEj>U*Nnjr`GC1zsP9%5)6);zc7AgVVC~@mf4=^_U3nN zu8fS1n@u?8@-hC{d`V22k@4QB*W} XyiNc`W!zm{-5Asv)<pfP6Lo zV11)F_t@5nCUeEp6F)OBIQK9xuycZqU}SLoAIZTx@x>|@pGw!1&C?kFJ2Lw-7*Afv eBD#64vogELZMA@WpeYO|kA}Pj(bsO)PXYk#Y9$~5 delta 133 zcmaDdmGQ|`MiT}`1_lORh6V;^h5$FW5Z|(3b_)guuM~HwJZvwLty?AYaWt zSl=l1ad7xVleyw1iJuu5oO>7;*g3&QFfus)&JMpm@x>|@CvRVd&C?kFJ2J~K7*Afv eBD#64vogEL)h$LlfTl208Fv>~HwJZv4GauHFMxbC x|6qNi=;YWt6HN{>*SD%o{IQD3r*iWW#?nCHx2`*YDi}6Sk$VNAuibmd0syRp92fuq delta 97 zcmZ3pjB(8}MiT}`1_lN`h6V;^h6Fda5Z^d;qvZ??!2&>08Fv>~HwJZv4GauHFMxbC x|6qNi=;Xwc6HN{>e_ZS{@y9BrfV9m^7)t|%w;1gJs$keSMeY@dzIN{+3jn2692fuq diff --git a/src/frontends/qt/GuiFontLoader.cpp b/src/frontends/qt/GuiFontLoader.cpp index 82dafbffd7..c22c7f1c96 100644 --- a/src/frontends/qt/GuiFontLoader.cpp +++ b/src/frontends/qt/GuiFontLoader.cpp @@ -207,7 +207,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");