sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

svg_parser - cleanup + consistent push/pop attributes

Browse source
This commit is contained in:
Artem Pavlenko 2024-04-30 10:01:02 +01:00
parent 77cd733258
commit e412e12599
1 changed files with 98 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/svg/svg_parser.cpp
View file

@ -500,7 +500,7 @@ void traverse_tree(svg_parser& parser, rapidxml::xml_node<char> const* node)
switch (node->type()) switch (node->type())
{ {
case rapidxml::node_element: { case rapidxml::node_element:
parser.font_sizes_.push_back(parser.font_sizes_.back()); parser.font_sizes_.push_back(parser.font_sizes_.back());
switch (name) switch (name)
{ {
@ -525,22 +525,13 @@ void traverse_tree(svg_parser& parser, rapidxml::xml_node<char> const* node)
case "radialGradient"_case: case "radialGradient"_case:
parse_radial_gradient(parser, node); parse_radial_gradient(parser, node);
break; break;
}
if (!parser.is_defs_) // FIXME
{
switch (name)
{
case "g"_case: case "g"_case:
if (node->first_node() != nullptr)
{
parser.path_.push_attr(); parser.path_.push_attr();
parse_id(parser, node); parse_id(parser, node);
if (parser.css_style_) if (parser.css_style_)
process_css(parser, node); process_css(parser, node);
parse_attr(parser, node); parse_attr(parser, node);
parser.path_.begin_group(); parser.path_.begin_group();
}
break; break;
case "use"_case: case "use"_case:
parser.path_.push_attr(); parser.path_.push_attr();
@ -570,12 +561,7 @@ void traverse_tree(svg_parser& parser, rapidxml::xml_node<char> const* node)
parser.path_.end_group(); parser.path_.end_group();
} }
parser.path_.pop_attr(); parser.path_.pop_attr();
} break;
}
else
{
// save node for later
parse_id(parser, node);
} }
if ("style"_case == name) if ("style"_case == name)
@ -607,7 +593,6 @@ void traverse_tree(svg_parser& parser, rapidxml::xml_node<char> const* node)
} }
end_element(parser, node); end_element(parser, node);
}
break; break;
default: default:
break; break;
@ -618,20 +603,15 @@ void end_element(svg_parser& parser, rapidxml::xml_node<char> const* node)
{ {
parser.font_sizes_.pop_back(); parser.font_sizes_.pop_back();
auto name = name_to_int(node->name()); auto name = name_to_int(node->name());
if (!parser.is_defs_ && (name == "g"_case)) if (name == "g"_case)
{ {
parser.path_.end_group(); parser.path_.end_group();
if (node->first_node() != nullptr)
{
parser.path_.pop_attr(); parser.path_.pop_attr();
}
} }
else if (name == "svg"_case) else if (name == "svg"_case)
{ {
// if (node->first_node() != nullptr) parser.path_.pop_attr();
//{
// parser.path_.pop_attr();
//}
} }
else if (name == "defs"_case) else if (name == "defs"_case)
{ {
@ -680,7 +660,7 @@ void parse_element(svg_parser& parser, char const* name, rapidxml::xml_node<char
parse_ellipse(parser, node); parse_ellipse(parser, node);
break; break;
case "svg"_case: case "svg"_case:
// parser.path_.push_attr(); parser.path_.push_attr();
parse_dimensions(parser, node); parse_dimensions(parser, node);
parse_attr(parser, node); parse_attr(parser, node);
parser.path_.set_opacity(parser.path_.cur_attr().opacity); parser.path_.set_opacity(parser.path_.cur_attr().opacity);