1 files changed, 62 insertions, 12 deletions

diff --git a/store.js b/store.js
index e73ba9f..49f25c5 100644
--- a/store.js
+++ b/store.js
@@ -97,7 +97,7 @@ XML_Serializer.prototype.serialize = function (object) {
     this.flushMedia();
     xml = this.store(object);
     this.flush();
-    return xml;
+    return vkbeautify.xml(xml);
 };
 
 XML_Serializer.prototype.store = function (object, mediaID) {
@@ -135,7 +135,7 @@ XML_Serializer.prototype.mediaXML = function () {
         );
         xml = xml + str;
     });
-    return xml + '</media>';
+    return vkbeautify.xml(xml + '</media>');
 };
 
 XML_Serializer.prototype.add = function (object) {
@@ -459,9 +459,17 @@ SnapSerializer.prototype.rawLoadProjectModel = function (xmlNode) {
         myself.loadValue(model);
     });
 
-    // restore nesting associations
+    // restore inheritance and nesting associations
     myself.project.stage.children.forEach(function (sprite) {
-        var anchor;
+        var exemplar, anchor;
+        if (sprite.inheritanceInfo) { // only sprites can inherit
+            exemplar = myself.project.sprites[
+                sprite.inheritanceInfo.exemplar
+            ];
+            if (exemplar) {
+                sprite.setExemplar(exemplar);
+            }
+        }
         if (sprite.nestingInfo) { // only sprites may have nesting info
             anchor = myself.project.sprites[sprite.nestingInfo.anchor];
             if (anchor) {
@@ -471,6 +479,7 @@ SnapSerializer.prototype.rawLoadProjectModel = function (xmlNode) {
         }
     });
     myself.project.stage.children.forEach(function (sprite) {
+        delete sprite.inheritanceInfo;
         if (sprite.nestingInfo) { // only sprites may have nesting info
             sprite.nestingScale = +(sprite.nestingInfo.scale || sprite.scale);
             delete sprite.nestingInfo;
@@ -535,11 +544,26 @@ SnapSerializer.prototype.rawLoadProjectModel = function (xmlNode) {
                 hidden
             );
         }
-        if (watcher) {
-            watcher.setStyle(model.attributes.style || 'normal');
-            if (watcher.style === 'slider') {
-                watcher.setSliderMin(model.attributes.min || '1');
-                watcher.setSliderMax(model.attributes.max || '100');
+        watcher.setStyle(model.attributes.style || 'normal');
+        if (watcher.style === 'slider') {
+            watcher.setSliderMin(model.attributes.min || '1', true);
+            watcher.setSliderMax(model.attributes.max || '100', true);
+        }
+        watcher.setPosition(
+            project.stage.topLeft().add(new Point(
+                +model.attributes.x || 0,
+                +model.attributes.y || 0
+            ))
+        );
+        project.stage.add(watcher);
+        watcher.onNextStep = function () {this.currentValue = null; };
+
+        // set watcher's contentsMorph's extent if it is showing a list and
+        // its monitor dimensions are given
+        if (watcher.currentValue instanceof List) {
+            extX = model.attributes.extX;
+            if (extX) {
+                watcher.cellMorph.contentsMorph.setWidth(+extX);
             }
             watcher.setPosition(
                 project.stage.topLeft().add(new Point(
@@ -647,9 +671,17 @@ SnapSerializer.prototype.loadSprites = function (xmlString, ide) {
         myself.loadObject(sprite, model);
     });
 
-    // restore nesting associations
+    // restore inheritance and nesting associations
     project.stage.children.forEach(function (sprite) {
-        var anchor;
+        var exemplar, anchor;
+        if (sprite.inheritanceInfo) { // only sprites can inherit
+            exemplar = project.sprites[
+                sprite.inheritanceInfo.exemplar
+            ];
+            if (exemplar) {
+                sprite.setExemplar(exemplar);
+            }
+        }
         if (sprite.nestingInfo) { // only sprites may have nesting info
             anchor = project.sprites[sprite.nestingInfo.anchor];
             if (anchor) {
@@ -659,6 +691,7 @@ SnapSerializer.prototype.loadSprites = function (xmlString, ide) {
         }
     });
     project.stage.children.forEach(function (sprite) {
+        delete sprite.inheritanceInfo;
         if (sprite.nestingInfo) { // only sprites may have nesting info
             sprite.nestingScale = +(sprite.nestingInfo.scale || sprite.scale);
             delete sprite.nestingInfo;
@@ -698,6 +731,7 @@ SnapSerializer.prototype.loadMediaModel = function (xmlNode) {
 SnapSerializer.prototype.loadObject = function (object, model) {
     // private
     var blocks = model.require('blocks');
+    this.loadInheritanceInfo(object, model);
     this.loadNestingInfo(object, model);
     this.loadCostumes(object, model);
     this.loadSounds(object, model);
@@ -707,6 +741,14 @@ SnapSerializer.prototype.loadObject = function (object, model) {
     this.loadScripts(object.scripts, model.require('scripts'));
 };
 
+SnapSerializer.prototype.loadInheritanceInfo = function (object, model) {
+    // private
+    var info = model.childNamed('inherit');
+    if (info) {
+        object.inheritanceInfo = info.attributes;
+    }
+};
+
 SnapSerializer.prototype.loadNestingInfo = function (object, model) {
     // private
     var info = model.childNamed('nest');
@@ -1045,7 +1087,7 @@ SnapSerializer.prototype.obsoleteBlock = function (isReporter) {
             : new CommandBlockMorph();
     block.selector = 'nop';
     block.color = new Color(200, 0, 20);
-    block.setSpec('Obsolete!');
+    block.setSpec(localize('Obsolete!'));
     block.isDraggable = true;
     return block;
 };
@@ -1475,6 +1517,7 @@ SpriteMorph.prototype.toXML = function (serializer) {
             ' draggable="@"' +
             '%' +
             ' costume="@" color="@,@,@" pen="@" ~>' +
+            '%' + // inheritance info
             '%' + // nesting info
             '<costumes>%</costumes>' +
             '<sounds>%</sounds>' +
@@ -1497,6 +1540,13 @@ SpriteMorph.prototype.toXML = function (serializer) {
         this.color.b,
         this.penPoint,
 
+        // inheritance info
+        this.exemplar
+            ? '<inherit exemplar="' +
+                    this.exemplar.name
+                    + '"/>'
+            : '',
+
         // nesting info
         this.anchor
             ? '<nest anchor="' +