root->set_name("nil");
return root;
default:
- synfig::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str()));
+ synfig::error(strprintf(_("Unknown value(%s), cannot create XML representation!"),ValueBase::type_local_name(data.get_type()).c_str()));
root->set_name("nil");
return root;
}
waypoint_node->set_attribute("before","halt");
break;
case INTERPOLATION_LINEAR:
- // This is the default value for angles, so don't add a new attribute for them
- if (value_node->get_type() != ValueBase::TYPE_ANGLE)
- waypoint_node->set_attribute("before","linear");
+ waypoint_node->set_attribute("before","linear");
break;
case INTERPOLATION_MANUAL:
waypoint_node->set_attribute("before","manual");
waypoint_node->set_attribute("before","constant");
break;
case INTERPOLATION_TCB:
- // This is the default value, so don't add a new attribute (unless it's an angle - they default to linear)
- if (value_node->get_type() == ValueBase::TYPE_ANGLE)
- waypoint_node->set_attribute("before","auto");
+ waypoint_node->set_attribute("before","auto");
break;
default:
error("Unknown waypoint type for \"before\" attribute");
waypoint_node->set_attribute("after","halt");
break;
case INTERPOLATION_LINEAR:
- // This is the default value for angles, so don't add a new attribute for them
- if (value_node->get_type() != ValueBase::TYPE_ANGLE)
- waypoint_node->set_attribute("after","linear");
+ waypoint_node->set_attribute("after","linear");
break;
case INTERPOLATION_MANUAL:
waypoint_node->set_attribute("after","manual");
waypoint_node->set_attribute("after","constant");
break;
case INTERPOLATION_TCB:
- // This is the default value, so don't add a new attribute (unless it's an angle - they default to linear)
- if (value_node->get_type() == ValueBase::TYPE_ANGLE)
- waypoint_node->set_attribute("after","auto");
+ waypoint_node->set_attribute("after","auto");
break;
default:
error("Unknown waypoint type for \"after\" attribute");
int i;
for(i=0;i<value_node->link_count();i++)
{
- string name(strprintf("c%d",i+1));
+ string name(value_node->link_name(i));
assert(value_node->get_link(i));
if(value_node->get_link(i)->is_exported())
root->set_attribute(name,value_node->get_link(i)->get_relative_id(canvas));
root->set_name("canvas");
if(canvas->is_root())
- root->set_attribute("version","0.1");
+ root->set_attribute("version",canvas->get_version());
if(!canvas->get_id().empty() && !canvas->is_root() && !canvas->is_inline())
root->set_attribute("id",canvas->get_id());
}
// Output the <defs> section
- if(!canvas->is_inline() && !canvas->value_node_list().empty() || !canvas->children().empty())
+ //! \todo check where the parentheses should really go - around the && or the ||?
+ if((!canvas->is_inline() && !canvas->value_node_list().empty()) || !canvas->children().empty())
{
xmlpp::Element *node=root->add_child("defs");
const ValueNodeList &value_node_list(canvas->value_node_list());