X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=c56986e4cc0ec375bf4127299112eaa39ba87eea;hb=feaa9da99368196af3a5b5a613a839e7768c05fb;hp=8ccb099373b3ccf58adf5fc29228e2878d0349a2;hpb=99b75ef1bb279e2314516f922f05696263d5bd27;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 8ccb099..c56986e 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -248,7 +248,7 @@ xmlpp::Element* encode_value(xmlpp::Element* root,const ValueBase &data,Canvas::
 		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;
 	}
@@ -292,9 +292,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 			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");
@@ -303,9 +301,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 			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");
@@ -317,9 +313,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 			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");
@@ -328,9 +322,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 			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");
@@ -360,7 +352,7 @@ xmlpp::Element* encode_composite(xmlpp::Element* root,ValueNode_Composite::Const
 	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));
@@ -644,7 +636,7 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle 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());