[LyX/master] Remove remnants regarding old XLFD font handling

Scott Kostyshak skostysh at lyx.org
Thu Mar 19 16:23:14 UTC 2020


commit d255339a4c3029222b6d2d5417e164e5c8bc4776
Author: Scott Kostyshak <skostysh at lyx.org>
Date:   Thu Mar 19 12:39:07 2020 -0400

    Remove remnants regarding old XLFD font handling
    
    These fonts are no longer supported by Qt 5 and our code no longer
    uses the "xlfd" member of the struct modified in this commit. See
    d4ff3a2959.
---
 src/frontends/qt/GuiFontLoader.cpp |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/frontends/qt/GuiFontLoader.cpp b/src/frontends/qt/GuiFontLoader.cpp
index c6c0ecb..69dba8d 100644
--- a/src/frontends/qt/GuiFontLoader.cpp
+++ b/src/frontends/qt/GuiFontLoader.cpp
@@ -64,22 +64,21 @@ namespace {
 struct SymbolFont {
 	FontFamily lyx_family;
 	QString family;
-	QString xlfd;
 };
 
 SymbolFont symbol_fonts[] = {
-	{ SYMBOL_FAMILY,"symbol", "-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific"},
-	{ CMR_FAMILY,   "cmr10",  "-*-cmr10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-	{ CMSY_FAMILY,  "cmsy10", "-*-cmsy10-*-*-*-*-*-*-*-*-*-*-*-*" },
-	{ CMM_FAMILY,   "cmmi10", "-*-cmmi10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-	{ CMEX_FAMILY,  "cmex10", "-*-cmex10-*-*-*-*-*-*-*-*-*-*-*-*" },
-	{ MSA_FAMILY,   "msam10", "-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*" },
-	{ MSB_FAMILY,   "msbm10", "-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*" },
-	{ EUFRAK_FAMILY,"eufm10", "-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-	{ RSFS_FAMILY,  "rsfs10", "-*-rsfs10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-	{ STMARY_FAMILY,"stmary10","-*-stmary10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-	{ WASY_FAMILY,  "wasy10", "-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*" },
-	{ ESINT_FAMILY, "esint10","-*-esint10-medium-*-*-*-*-*-*-*-*-*-*-*" }
+	{ SYMBOL_FAMILY,"symbol"},
+	{ CMR_FAMILY,   "cmr10"},
+	{ CMSY_FAMILY,  "cmsy10"},
+	{ CMM_FAMILY,   "cmmi10"},
+	{ CMEX_FAMILY,  "cmex10"},
+	{ MSA_FAMILY,   "msam10"},
+	{ MSB_FAMILY,   "msbm10"},
+	{ EUFRAK_FAMILY,"eufm10"},
+	{ RSFS_FAMILY,  "rsfs10"},
+	{ STMARY_FAMILY,"stmary10"},
+	{ WASY_FAMILY,  "wasy10"},
+	{ ESINT_FAMILY, "esint10"}
 };
 
 size_t const nr_symbol_fonts = sizeof(symbol_fonts) / sizeof(symbol_fonts[0]);


More information about the lyx-cvs mailing list