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.

diff --git a/lib/fonts/cmex10.sfd b/lib/fonts/cmex10.sfd
index cea4d9d5a67fff04018b0228f021f6bff0869ce8..8431e86d9396977fb7392af9bd81f17380a66b31 100644 (file)
--- 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 (executable)
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 da3416ae5f50302cd73b3566f2a601beaebd22d2..463e38aa9a4606c2f5138f60ded31227539a6faf 100644 (file)
--- 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 (executable)
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 80f8e565fb6039a03ecdc01c1cc327ca10f0fd2e..641fe4dd2bbc6c8147c8582cd926f2700b0e436c 100644 (file)
--- 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 (executable)
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 ad7e4839becad6cabd5701cd18f51b483d9e13c9..5ae7f207ecd62cc7ab54f5c42e6a053ffe9360d4 100644 (file)
--- 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 (executable)
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 9ab5bc26223def5e3d56bd9e0869d4558fd96f05..bf7e98b115e960539771eb529420f8b23816acaf 100644 (file)
--- 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 (executable)
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 eb0b568859228a762b54cb7fa95081c75dfc7531..71a4fe1c51f3659542e74c50a68b3045c3ead68c 100644 (file)
--- 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 (executable)
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 c80451aae4bb2edca904a5c4cfb662e5294f60fd..7082f5e8d00742dafb37209ba3a7a52db4a182fa 100644 (file)
--- 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 (executable)
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 20030cdf2932ac9c363f0e3b26be58e09c36d17d..4e21436d0800edbf8cfc53788d0fd93489f489b7 100644 (file)
--- 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 (executable)
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 de6db2784f90ae1f5c837fb5fc071c5ada2b755d..2453f50cabca931080015ba7a4c7dcd2b1d163df 100644 (file)
--- 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 (executable)
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 8206bdfd8795afbee3bdff7fed158a2dcd49f276..b28f6f411d42f4da8d54c45bf3c591edb65c948e 100644 (file)
--- 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 (executable)
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 f1841d9a060e248ae0adda8bc32eb2f553800f45..56637c844ae9bd1570f16bb283482cf7c04954c3 100644 (file)
--- 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 (executable)
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 f70df41efab915252e36632c05437864aecc4821..10468b5b000b329975b602f0dd8b6b3c6c642625 100644 (file)
--- 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 (executable)
Binary files a/lib/fonts/wasy10.ttf and b/lib/fonts/wasy10.ttf differ

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index bfc215d376f2825f5d294d90dfdec5ef8e9ee494..24e5e9b7b602bc4ddcd94b13ab0aa07d3106ba22 100644 (file)
--- 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 552ccd7968e4b8cec0ef103a81fcee7e8c5064de..cf4d1b2d7b5fa1a8bce73fb9f069d1579844ba53 100644 (file)
--- 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