On Wed, Sep 02, 2020 at 09:36:01PM +0200, Kornel Benko wrote:
> Am Wed, 2 Sep 2020 21:29:41 +0200
> schrieb Enrico Forestieri <[email protected]>:
>
> > On Wed, Sep 02, 2020 at 08:27:03PM +0200, Kornel Benko wrote:
> > >
> > > Works here. (Mint 19.3)
> > > $ fc-match esint
> > > DejaVuSans.ttf: "DejaVu Sans" "Book"
> >
> > Even when the texlive fonts are managed by fontconfig?
> >
>
> Yes, they are here.
Good. Let's see whether it also works for Cor.
In the meantime, I discovered that specifying the foundry on Windows
breaks everything, in the sense that funny symbols appear instead
of the integrals and co. So, even if this is documented in the Qt
docs, we cannot specify a foundry there...
Updated patch attached.
--
Enrico
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..6602fd8b225443191ec5cde89632a536135672d2
100755
GIT binary patch
delta 334
zcmZ4Ti*d~_#(D-u1_lOxh6V;^h5|RY5Z`6z6F3<dY6XCzGVU&}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<)Jo2M`^R2Kk^DJv*SEeOk3E(Tg-0CE=C3yhL8#UgqA;`wd9
zGRSiPg%RMwBdLJN3XGA=EG%0m*D#u?`Bb{5FdSe|U^v3M<X;Q}0~-SqNHr)V7??X*
n%Yl>v1LNikjH1=-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)<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
s-(VE2w&w$~B!EhQ4gg9pGPD6P3z!E{2vH0sPj==T0%hRf!Xv2w06IEOEC2ui
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<a;R>+H!jjAm*+m98la2N)C>4zn)%5yZg2X3f41s2mg$46H4z
z<v>b-fpPN%M%`R{9w0}IL5_h5D9y;w3dAfx5hfr8DF<tT(O2KP?f|mk0Aw!!4U<h=
delta 326
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(
lVDk+|-CRySAWH(MgkdsIzN{oz>SSlWAxHrXTzDk4003r`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/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_<PjXp_LO7=nkj>rzl<!C@NY7;wJe0`5
zz*+;8zmc9(nKs2(kePvjQ-XmZYDGqBB5R7(*%>MmTa*QFFfcGl<m4wOD!cGrVqoCl
zn7BjU^8iq=yCA=~WUHOZOa_KDAD}TM1x2X^J2=i*0<8%FTB8N_0;9399IvQIJipCX
z26+ykFalh7B)w#^0%IgI3!D1n8b&iUpGwyhh64-=42L<`{&)fHVq@M0R1OLW2G(8{
zkf90;jGHeozD>2~0dm9`<QSNM(u@qPK+FOZVFF^1a<CQ{ef6#D4j>y2K=uLv2Tx3Q
delta 326
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
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)<u7o01b&@jsYqLg#!c2b=GPi
yrNF?r`2u5Xk3A2NBgP=dzyy?L1O^f#1JL0>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_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!
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%`L<?!n9@%1B2EKps0+yi>n)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+<BQ-JQS#0HXpyVGQHp>7Ca0D{;
z0yUce`6?N?B^6NyY?pxi8$f<VPJVJ?OF;Drp#C`%Psm$_0Bv$8$S*F*$zf9i+A;;G
zC<*LCMh3@Q=Bn4@`E9;3aI*k~85lOENu_}33y);#Co3>UGO|prVzf~6sdP<YXk>6y
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
Zi<p2IWD5{ameZ;dx%$?12at>6P5?K2X&V3l
delta 425
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}gHNXnU?lMiT`1cL$t!(<*U>B*W}
X<sv6L^9?~(Y)q3%0nry8$<zY?<6CM1
diff --git a/lib/fonts/wasy10.sfd b/lib/fonts/wasy10.sfd
index 2276acbc59..c96fc838c5 100644
--- a/lib/fonts/wasy10.sfd
+++ b/lib/fonts/wasy10.sfd
@@ -52,7 +52,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
d512ed5bacb922c2e1cf1e7cb145b2803a7352a9..7d0ab92fbe22756cd251bc73ae847a129d79fe47
100755
GIT binary patch
delta 97
zcmZ3pjB(8}MiT}`1_lN`h6V;^h6Fda5Z|~2*X0Zh!2&>08Fv>~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");
--
lyx-devel mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-devel
