summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2013-02-04 01:33:03 +0000
committerJohn Smith <john.smith7545@yahoo.com>2013-02-04 01:33:03 +0000
commit04ba54c3e2586155cef3421ef2a9b27565a8dbe7 (patch)
tree56b0823d970f68f30c8e0d121ec87b0cba44f7be /src/libnrtype
parentadd todo comment for fixing fontstyle fall-back behaviour (diff)
downloadinkscape-04ba54c3e2586155cef3421ef2a9b27565a8dbe7.tar.gz
inkscape-04ba54c3e2586155cef3421ef2a9b27565a8dbe7.zip
Fix for 1002757 : Regressions with new default font 'sans-serif' - fix map
(bzr r12096)
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/FontFactory.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index 6c95c0363..a9220d867 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -407,11 +407,11 @@ const char *sp_font_description_get_family(PangoFontDescription const *fontDescr
static std::map<Glib::ustring, Glib::ustring> fontNameMap;
std::map<Glib::ustring, Glib::ustring>::iterator it;
- fontNameMap.insert(std::make_pair("Sans", "sans-serif"));
- fontNameMap.insert(std::make_pair("Serif", "serif"));
- fontNameMap.insert(std::make_pair("Monospace", "monospace"));
- //fontNameMap.insert(std::make_pair("", "cursive"));
- //fontNameMap.insert(std::make_pair("", "fantasy"));
+ if (fontNameMap.empty()) {
+ fontNameMap.insert(std::make_pair("Sans", "sans-serif"));
+ fontNameMap.insert(std::make_pair("Serif", "serif"));
+ fontNameMap.insert(std::make_pair("Monospace", "monospace"));
+ }
const char *pangoFamily = pango_font_description_get_family(fontDescr);