From f757f360fc176d041eb03a647a25e891214fc6a3 Mon Sep 17 00:00:00 2001 From: Geoff Lankow Date: Sun, 31 Dec 2017 15:05:38 +1300 Subject: Escape font name when setting preview text --- src/ui/dialog/text-edit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 33c173a1c..078c7603c 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -367,6 +367,7 @@ void TextEdit::setPreviewText (Glib::ustring font_spec, Glib::ustring phrase) return; } + Glib::ustring font_spec_escaped = Glib::Markup::escape_text( font_spec ); Glib::ustring phrase_escaped = Glib::Markup::escape_text( phrase ); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -379,7 +380,7 @@ void TextEdit::setPreviewText (Glib::ustring font_spec, Glib::ustring phrase) std::ostringstream size_st; size_st << int(pt_size * PANGO_SCALE); // Markup code expects integers - Glib::ustring markup = "" + phrase_escaped + ""; preview_label.set_markup(markup.c_str()); -- cgit v1.2.3 From 5ef79fa58a509ad51c23f2ad93460ca2061642cd Mon Sep 17 00:00:00 2001 From: Geoff Lankow Date: Sun, 31 Dec 2017 16:00:43 +1300 Subject: Don't double-escape names of used fonts --- src/libnrtype/font-lister.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 35dc5ecc3..1b75f70af 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -1085,7 +1085,7 @@ void font_lister_cell_data_func(GtkCellLayout * /*cell_layout*/, markup = ""; /* See if font-family on system */ - std::vector tokens = Glib::Regex::split_simple("\\s*,\\s*", family_escaped); + std::vector tokens = Glib::Regex::split_simple("\\s*,\\s*", family); for (size_t i = 0; i < tokens.size(); ++i) { Glib::ustring token = tokens[i]; -- cgit v1.2.3