From 18d24983b6598cf4fbb6549d1e4e3bbc3c756ba4 Mon Sep 17 00:00:00 2001 From: Hermann Kraus Date: Mon, 6 Feb 2012 11:08:54 +0100 Subject: [PATCH] Fix font-name checking when font-set is available. Fixes #1064. --- src/load_map.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/load_map.cpp b/src/load_map.cpp index 39b144d0d..b4f65bf11 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -1282,7 +1282,9 @@ void map_parser::parse_text_symbolizer( rule & rule, ptree const & sym ) } placement_finder->properties.from_xml(sym, fontsets_); - if (strict_) ensure_font_face(placement_finder->properties.default_format.face_name); + if (strict_ && + !placement_finder->properties.default_format.fontset.size()) + ensure_font_face(placement_finder->properties.default_format.face_name); if (list) { ptree::const_iterator symIter = sym.begin(); ptree::const_iterator endSym = sym.end(); @@ -1296,7 +1298,9 @@ void map_parser::parse_text_symbolizer( rule & rule, ptree const & sym ) ensure_attrs(symIter->second, "TextSymbolizer/Placement", s_common.str()); text_symbolizer_properties & p = list->add(); p.from_xml(symIter->second, fontsets_); - if (strict_) ensure_font_face(p.default_format.face_name); + if (strict_ && + !p.default_format.fontset.size()) + ensure_font_face(p.default_format.face_name); } }