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 cf8cd4ce9c..af088f4c6e 100755 Binary files a/lib/fonts/cmex10.ttf and b/lib/fonts/cmex10.ttf differ 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 9b2b430e5d..6602fd8b22 100755 Binary files a/lib/fonts/cmmi10.ttf and b/lib/fonts/cmmi10.ttf differ 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 e405536e6d..efff9fcf59 100755 Binary files a/lib/fonts/cmr10.ttf and b/lib/fonts/cmr10.ttf differ 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 40cb3a8cf0..2544757e76 100755 Binary files a/lib/fonts/cmsy10.ttf and b/lib/fonts/cmsy10.ttf differ 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 07db01fa7e..aba22e34f4 100755 Binary files a/lib/fonts/dsrom10.ttf and b/lib/fonts/dsrom10.ttf differ 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 8626dec2ea..87d6b54047 100755 Binary files a/lib/fonts/esint10.ttf and b/lib/fonts/esint10.ttf differ 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 0e670d4635..da7d5c3b2e 100755 Binary files a/lib/fonts/eufm10.ttf and b/lib/fonts/eufm10.ttf differ 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 3b0cd89d0b..cb2db1ddc3 100755 Binary files a/lib/fonts/msam10.ttf and b/lib/fonts/msam10.ttf differ 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 04a4717d64..5c92808046 100755 Binary files a/lib/fonts/msbm10.ttf and b/lib/fonts/msbm10.ttf differ 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 4160bcf704..4559b85ec6 100755 Binary files a/lib/fonts/rsfs10.ttf and b/lib/fonts/rsfs10.ttf differ diff --git a/lib/fonts/stmary10.sfd b/lib/fonts/stmary10.sfd index c3e35d894e..37c4231741 100644 Binary files a/lib/fonts/stmary10.sfd and b/lib/fonts/stmary10.sfd differ diff --git a/lib/fonts/stmary10.ttf b/lib/fonts/stmary10.ttf index a23f0320bd..328ab6ab5f 100755 Binary files a/lib/fonts/stmary10.ttf and b/lib/fonts/stmary10.ttf differ 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 d512ed5bac..7d0ab92fbe 100755 Binary files a/lib/fonts/wasy10.ttf and b/lib/fonts/wasy10.ttf differ 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");