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

rename wrap-char -> wrap-character to match Mapnik 2.3.x - refs #2333

Browse source
This commit is contained in:
Dane Springmeyer 2014-09-19 16:53:03 -07:00
parent 0c901f790e
commit 69dd74e079
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/text/formatting/format.cpp
View file

@ -45,7 +45,7 @@ void format_node::to_xml(ptree & xml) const
if (line_spacing) serialize_property("line-spacing", *line_spacing, new_node); if (line_spacing) serialize_property("line-spacing", *line_spacing, new_node);
if (text_opacity) serialize_property("opacity", *text_opacity, new_node); if (text_opacity) serialize_property("opacity", *text_opacity, new_node);
if (wrap_before) serialize_property("wrap-before", *wrap_before, new_node); if (wrap_before) serialize_property("wrap-before", *wrap_before, new_node);
if (repeat_wrap_char) serialize_property("repeat-wrap-char", *repeat_wrap_char, new_node); if (repeat_wrap_char) serialize_property("repeat-wrap-character", *repeat_wrap_char, new_node);
if (fill) serialize_property("fill", *fill, new_node); if (fill) serialize_property("fill", *fill, new_node);
if (halo_fill) serialize_property("halo-fill", *halo_fill, new_node); if (halo_fill) serialize_property("halo-fill", *halo_fill, new_node);
if (halo_radius) serialize_property("halo-radius", *halo_radius, new_node); if (halo_radius) serialize_property("halo-radius", *halo_radius, new_node);

4
src/text/formatting/layout.cpp
View file

@ -51,7 +51,7 @@ void layout_node::to_xml(ptree &xml) const
if (text_ratio) serialize_property("text-ratio", *text_ratio, new_node); if (text_ratio) serialize_property("text-ratio", *text_ratio, new_node);
if (wrap_width) serialize_property("wrap-width", *wrap_width, new_node); if (wrap_width) serialize_property("wrap-width", *wrap_width, new_node);
if (wrap_before) serialize_property("wrap-before", *wrap_before, new_node); if (wrap_before) serialize_property("wrap-before", *wrap_before, new_node);
if (repeat_wrap_char) serialize_property("repeat-wrap-char", *repeat_wrap_char, new_node); if (repeat_wrap_char) serialize_property("repeat-wrap-character", *repeat_wrap_char, new_node);
if (rotate_displacement) serialize_property("rotate-displacement", *rotate_displacement, new_node); if (rotate_displacement) serialize_property("rotate-displacement", *rotate_displacement, new_node);
if (orientation) serialize_property("orientation", *orientation, new_node); if (orientation) serialize_property("orientation", *orientation, new_node);
if (halign) serialize_property("horizontal-alignment", *halign, new_node); if (halign) serialize_property("horizontal-alignment", *halign, new_node);
@ -72,7 +72,7 @@ node_ptr layout_node::from_xml(xml_node const& xml, fontset_map const& fontsets)
if (xml.has_attribute("text-ratio")) set_property_from_xml<double>(n->text_ratio, "text-ratio", xml); if (xml.has_attribute("text-ratio")) set_property_from_xml<double>(n->text_ratio, "text-ratio", xml);
if (xml.has_attribute("wrap-width")) set_property_from_xml<double>(n->wrap_width, "wrap-width", xml); if (xml.has_attribute("wrap-width")) set_property_from_xml<double>(n->wrap_width, "wrap-width", xml);
if (xml.has_attribute("wrap-before")) set_property_from_xml<mapnik::boolean_type>(n->wrap_before, "wrap-before", xml); if (xml.has_attribute("wrap-before")) set_property_from_xml<mapnik::boolean_type>(n->wrap_before, "wrap-before", xml);
if (xml.has_attribute("repeat-wrap-char")) set_property_from_xml<mapnik::boolean_type>(n->repeat_wrap_char, "repeat-wrap-char", xml); if (xml.has_attribute("repeat-wrap-character")) set_property_from_xml<mapnik::boolean_type>(n->repeat_wrap_char, "repeat-wrap-character", xml);
if (xml.has_attribute("rotate-displacement")) set_property_from_xml<mapnik::boolean_type>(n->rotate_displacement, "rotate-displacement", xml); if (xml.has_attribute("rotate-displacement")) set_property_from_xml<mapnik::boolean_type>(n->rotate_displacement, "rotate-displacement", xml);
if (xml.has_attribute("orientation")) set_property_from_xml<double>(n->orientation, "orientation", xml); if (xml.has_attribute("orientation")) set_property_from_xml<double>(n->orientation, "orientation", xml);
if (xml.has_attribute("horizontal-alignment")) set_property_from_xml<horizontal_alignment_e>(n->halign, "horizontal-alignment", xml); if (xml.has_attribute("horizontal-alignment")) set_property_from_xml<horizontal_alignment_e>(n->halign, "horizontal-alignment", xml);

8
src/text/text_properties.cpp
View file

@ -265,9 +265,9 @@ void text_layout_properties::from_xml(xml_node const &node, fontset_map const& f
set_property_from_xml<double>(dy, "dy", node); set_property_from_xml<double>(dy, "dy", node);
set_property_from_xml<double>(text_ratio, "text-ratio", node); set_property_from_xml<double>(text_ratio, "text-ratio", node);
set_property_from_xml<double>(wrap_width, "wrap-width", node); set_property_from_xml<double>(wrap_width, "wrap-width", node);
set_property_from_xml<std::string>(wrap_char, "wrap-char", node); set_property_from_xml<std::string>(wrap_char, "wrap-character", node);
set_property_from_xml<boolean_type>(wrap_before, "wrap-before", node); set_property_from_xml<boolean_type>(wrap_before, "wrap-before", node);
set_property_from_xml<boolean_type>(repeat_wrap_char, "repeat-wrap-char", node); set_property_from_xml<boolean_type>(repeat_wrap_char, "repeat-wrap-character", node);
set_property_from_xml<boolean_type>(rotate_displacement, "rotate-displacement", node); set_property_from_xml<boolean_type>(rotate_displacement, "rotate-displacement", node);
set_property_from_xml<double>(orientation, "orientation", node); set_property_from_xml<double>(orientation, "orientation", node);
set_property_from_xml<vertical_alignment_e>(valign, "vertical-alignment", node); set_property_from_xml<vertical_alignment_e>(valign, "vertical-alignment", node);
@ -286,9 +286,9 @@ void text_layout_properties::to_xml(boost::property_tree::ptree & node,
if (!(jalign == dfl.jalign) || explicit_defaults) serialize_property("justify-alignment", jalign, node); if (!(jalign == dfl.jalign) || explicit_defaults) serialize_property("justify-alignment", jalign, node);
if (!(text_ratio == dfl.text_ratio) || explicit_defaults) serialize_property("text-ratio", text_ratio, node); if (!(text_ratio == dfl.text_ratio) || explicit_defaults) serialize_property("text-ratio", text_ratio, node);
if (!(wrap_width == dfl.wrap_width) || explicit_defaults) serialize_property("wrap-width", wrap_width, node); if (!(wrap_width == dfl.wrap_width) || explicit_defaults) serialize_property("wrap-width", wrap_width, node);
if (!(wrap_char == dfl.wrap_char) || explicit_defaults) serialize_property("wrap-char", wrap_char, node); if (!(wrap_char == dfl.wrap_char) || explicit_defaults) serialize_property("wrap-character", wrap_char, node);
if (!(wrap_before == dfl.wrap_before) || explicit_defaults) serialize_property("wrap-before", wrap_before, node); if (!(wrap_before == dfl.wrap_before) || explicit_defaults) serialize_property("wrap-before", wrap_before, node);
if (!(repeat_wrap_char == dfl.repeat_wrap_char) || explicit_defaults) serialize_property("repeat-wrap-char", repeat_wrap_char, node); if (!(repeat_wrap_char == dfl.repeat_wrap_char) || explicit_defaults) serialize_property("repeat-wrap-character", repeat_wrap_char, node);
if (!(rotate_displacement == dfl.rotate_displacement) || explicit_defaults) if (!(rotate_displacement == dfl.rotate_displacement) || explicit_defaults)
serialize_property("rotate-displacement", rotate_displacement, node); serialize_property("rotate-displacement", rotate_displacement, node);
if (!(orientation == dfl.orientation) || explicit_defaults) serialize_property("orientation", orientation, node); if (!(orientation == dfl.orientation) || explicit_defaults) serialize_property("orientation", orientation, node);