compass 0.11.7 → 0.12.alpha.0

data/lib/compass/sass_extensions/sprites/sprite_methods.rb

@@ -14,7 +14,6 @@ module Compass
           @width = 0
           init_images
           compute_image_positions!
-          @height = @images.last.top + @images.last.height
           init_engine
         end
         
@@ -29,22 +28,10 @@ module Compass
         def init_images
           @images = image_names.collect do |relative_file|
             image = Compass::SassExtensions::Sprites::Image.new(self, relative_file, kwargs)
-            @width = [ @width, image.width + image.offset ].max
             image
           end
         end
         
-        # Calculates the overal image dimensions
-        # collects image sizes and input parameters for each sprite
-        def compute_image_positions!
-          @images.each_with_index do |image, index|
-            image.left = image.position.unit_str == "%" ? (@width - image.width) * (image.position.value / 100) : image.position.value
-            next if index == 0
-            last_image = @images[index-1]
-            image.top = last_image.top + last_image.height + [image.spacing,  last_image.spacing].max
-          end
-        end
-        
         # Validates that the sprite_names are valid sass
         def validate!
           for sprite_name in sprite_names
@@ -56,7 +43,7 @@ module Compass
 
         # The on-the-disk filename of the sprite
         def filename
-          File.join(Compass.configuration.images_path, "#{path}-s#{uniqueness_hash}.png")
+          File.join(Compass.configuration.generated_images_path, "#{path}-s#{uniqueness_hash}.png")
         end
 
         # Generate a sprite image if necessary
@@ -66,13 +53,13 @@ module Compass
               cleanup_old_sprites
             end
             engine.construct_sprite
-            Compass.configuration.run_callback(:sprite_generated, engine.canvas)
+            Compass.configuration.run_sprite_generated(engine.canvas)
             save!
           end
         end
         
         def cleanup_old_sprites
-          Dir[File.join(Compass.configuration.images_path, "#{path}-s*.png")].each do |file|
+          Dir[File.join(Compass.configuration.images_path, "#{path}-*.png")].each do |file|
             FileUtils.rm file
           end
         end
@@ -100,8 +87,9 @@ module Compass
 
         # Saves the sprite engine
         def save!
+          FileUtils.mkdir_p(File.dirname(filename))
           saved = engine.save(filename)
-          Compass.configuration.run_callback(:sprite_saved, filename)
+          Compass.configuration.run_sprite_saved(filename)
           saved
         end
 

data/lib/compass/sprite_importer.rb

@@ -1,6 +1,5 @@
 module Compass
   class SpriteImporter < Sass::Importers::Base
-    attr_accessor :uri, :options
     VAILD_FILE_NAME = /\A#{Sass::SCSS::RX::IDENT}\Z/
     SPRITE_IMPORTER_REGEX = %r{((.+/)?([^\*.]+))/(.+?)\.png}
     VALID_EXTENSIONS = ['.png']
@@ -8,32 +7,18 @@ module Compass
     # finds all sprite files
     def self.find_all_sprite_map_files(path)
       hex = "[0-9a-f]"
-      glob = "*-{,s}#{hex*10}{#{VALID_EXTENSIONS.join(",")}}"
+      glob = "*-s#{hex*10}{#{VALID_EXTENSIONS.join(",")}}"
       Dir.glob(File.join(path, "**", glob))
     end
-
-    def self.load(uri, options)
-      klass = Compass::SpriteImporter.new
-      klass.uri, klass.options = uri, options
-      klass
-    end
-    
-    def initialize(options ={})
-      @uri, @options = '', {}
-      options.each do |key, value|
-        send("#{key}=", value)
-      end
-    end
     
     def find(uri, options)
-      @uri, @options = uri, options
       if uri =~ SPRITE_IMPORTER_REGEX
-        return sass_engine
+        return self.class.sass_engine(uri, self.class.sprite_name(uri), self, options)
       end
+      nil
     end
     
     def find_relative(uri, base, options)
-      @uri, @options = uri, options
       find(File.join(base, uri), options)
     end
     
@@ -50,45 +35,47 @@ module Compass
     end
     
     def mtime(uri, options)
-      @uri, @options = uri, options
-      files.sort.inject(Time.at(0)) do |max_time, file|
+      self.class.files(uri).sort.inject(Time.at(0)) do |max_time, file|
         (t = File.mtime(file)) > max_time ? t : max_time
       end
     end
     
     def key(uri, options={})
-      @uri, @options = uri, options
-      [self.class.name + ":" + File.dirname(File.expand_path(uri)), File.basename(uri)]
+      [self.class.name + ":sprite:" + File.dirname(File.expand_path(uri)), File.basename(uri)]
     end
     
     def self.path_and_name(uri)
       if uri =~ SPRITE_IMPORTER_REGEX
         [$1, $3]
       else
-        raise Compass::Error "invalid sprite path"
+        raise Compass::Error, "invalid sprite path"
       end
     end
 
     # Name of this spite
-    def name
-      ensure_path_and_name!
-      @name
+    def self.sprite_name(uri)
+      _, name = path_and_name(uri)
+      name
     end
 
     # The on-disk location of this sprite
-    def path
-      ensure_path_and_name!
-      @path
+    def self.path(uri)
+      path, _ = path_and_name(uri)
+      path
     end
     
-    # Returns the Glob of image files for this sprite
-    def files
-      Dir[File.join(Compass.configuration.images_path, uri)].sort
+    # Returns the Glob of image files for the uri
+    def self.files(uri)
+      Compass.configuration.sprite_load_path.each do |folder|
+        files = Dir[File.join(folder, uri)].sort
+        next if files.empty?
+        return files
+      end
     end
 
     # Returns an Array of image names without the file extension
-    def sprite_names
-      files.collect do |file|
+    def self.sprite_names(uri)
+      files(uri).collect do |file|
         filename = File.basename(file, '.png')
         unless VAILD_FILE_NAME =~ filename
           raise Compass::Error, "Sprite file names must be legal css identifiers. Please rename #{File.basename(file)}"
@@ -97,31 +84,18 @@ module Compass
       end
     end
     
-    def validate_sprites!
-      files.each do |file|
-        unless VALID_EXTENSIONS.include? File.extname(file)
-          raise Compass::Error, "Invalid sprite extension only: #{VALID_EXTENSIONS.join(',')} images are allowed"
-        end
-      end
-    end
-    
-    # Returns the sass options for this sprite
-    def sass_options
-      options.merge(:filename => name, :syntax => :scss, :importer => self)
+    # Returns the sass_options for this sprite
+    def self.sass_options(name, importer, options)
+      options.merge!(:filename => name, :syntax => :scss, :importer => importer)
     end
     
     # Returns a Sass::Engine for this sprite object
-    def sass_engine
-      validate_sprites!
-      Sass::Engine.new(content_for_images, sass_options)
+    def self.sass_engine(uri, name, importer, options)
+      Sass::Engine.new(content_for_images(uri, name, options[:skip_overrides]), sass_options(name, importer, options))
     end
-    
-    def ensure_path_and_name!
-      @path, @name = self.class.path_and_name(uri)
-    end 
 
     # Generates the Sass for this sprite file
-    def content_for_images(skip_overrides = false)
+    def self.content_for_images(uri, name, skip_overrides = false)
       <<-SCSS
 @import "compass/utilities/sprites/base";
 
@@ -134,8 +108,9 @@ $#{name}-spacing: 0 !default;
 $#{name}-repeat: no-repeat !default;
 $#{name}-prefix: '' !default;
 $#{name}-clean-up: true !default;
+$#{name}-layout:vertical !default;
 
-#{skip_overrides ? "$#{name}-sprites: sprite-map(\"#{uri}\", $cleanup: $#{name}-clean-up);" : generate_overrides }
+#{skip_overrides ? "$#{name}-sprites: sprite-map(\"#{uri}\", $layout: $#{name}-layout, $cleanup: $#{name}-clean-up);" : generate_overrides(uri, name) }
 
 // All sprites should extend this class
 // The #{name}-sprite mixin will do so for you.
@@ -161,13 +136,13 @@ $#{name}-clean-up: true !default;
   @include sprite($#{name}-sprites, $name, $dimensions, $offset-x, $offset-y)
 }
 
-@mixin #{name}-sprites($sprite-names, $dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites)) {
-  @include sprites($#{name}-sprites, $sprite-names, $#{name}-sprite-base-class, $dimensions, $prefix)
+@mixin #{name}-sprites($sprite-names, $dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites), $offset-x: 0, $offset-y: 0) {
+  @include sprites($#{name}-sprites, $sprite-names, $#{name}-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y)
 }
 
 // Generates a class for each sprited image.
-@mixin all-#{name}-sprites($dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites)) {
-  @include #{name}-sprites(#{sprite_names.join(" ")}, $dimensions, $prefix);
+@mixin all-#{name}-sprites($dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites), $offset-x: 0, $offset-y: 0) {
+  @include #{name}-sprites(#{sprite_names(uri).join(" ")}, $dimensions, $prefix, $offset-x, $offset-y);
 }
 SCSS
     end
@@ -176,12 +151,13 @@ SCSS
     # <tt>$#{name}-#{sprite_name}-position </tt>
     # <tt> $#{name}-#{sprite_name}-spacing </tt>
     # <tt> #{name}-#{sprite_name}-repeat: </tt>
-    def generate_overrides
+    def self.generate_overrides(uri, name)
+      sprites = sprite_names(uri)
       content = <<-TXT
 // These variables control the generated sprite output
 // You can override them selectively before you import this file.
       TXT
-      sprite_names.map do |sprite_name| 
+      sprites.map do |sprite_name| 
         content += <<-SCSS
 $#{name}-#{sprite_name}-position: $#{name}-position !default;
 $#{name}-#{sprite_name}-spacing: $#{name}-spacing !default;
@@ -189,8 +165,8 @@ $#{name}-#{sprite_name}-repeat: $#{name}-repeat !default;
         SCSS
       end.join
 
-      content += "\n$#{name}-sprites: sprite-map(\"#{uri}\", \n$cleanup: $#{name}-clean-up,\n"
-      content += sprite_names.map do |sprite_name| 
+      content += "\n$#{name}-sprites: sprite-map(\"#{uri}\", \n$layout: $#{name}-layout, \n$cleanup: $#{name}-clean-up,\n"
+      content += sprites.map do |sprite_name| 
 %Q{  $#{sprite_name}-position: $#{name}-#{sprite_name}-position,
   $#{sprite_name}-spacing: $#{name}-#{sprite_name}-spacing,
   $#{sprite_name}-repeat: $#{name}-#{sprite_name}-repeat}

data/lib/compass/sprite_importer.rbc

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -140,284 +140,360 @@ x
 14
 SpriteImporter
 i
-279
+355
 5
 66
-65
+5
 7
 0
-44
-43
-1
 7
+1
+47
+49
 2
-45
+2
+15
+65
+7
 3
-4
+44
 43
+4
+7
 5
-43
+45
 6
-43
 7
+43
+8
+43
+9
+43
+10
 47
 101
-8
+11
 7
-9
+12
 63
 3
 78
 49
-10
+13
 2
 49
-11
+14
 2
 15
 65
 7
-12
+15
 7
-13
+16
 13
 70
 9
-55
+65
 15
 44
 43
-1
+4
 7
-14
+17
 78
 49
-10
+13
 2
 6
-13
+16
 49
-11
+14
 2
 15
 65
 7
-15
+18
 7
-16
+19
 64
 35
 1
 49
-11
+14
 2
 15
 99
 7
-17
+20
 7
-18
+21
 65
 5
 49
-19
+22
 4
 15
 99
 7
-20
+23
 7
-21
+24
 65
 67
 49
-22
+25
 0
 49
-23
+26
 4
 15
 99
 7
-24
+27
 7
-25
+28
 65
 67
 49
-22
+25
 0
 49
-23
+26
 4
 15
 99
 7
-8
+29
 7
+30
+65
+67
+49
+25
+0
+49
 26
+4
+15
+99
+7
+11
+7
+31
 65
 67
 49
-22
+25
 0
 49
-23
+26
 4
 15
 99
 7
-27
+32
 7
-28
+33
 65
 67
 49
-22
+25
 0
 49
-23
+26
 4
 15
 99
 7
-29
+34
 7
-30
+35
 65
 67
 49
-22
+25
 0
 49
-23
+26
 4
 15
 99
 7
-31
+36
 7
-32
+37
 65
 67
 49
-22
+25
 0
 49
-23
+26
 4
 15
 99
 7
-33
+38
 7
-34
+39
 65
 67
 49
-22
+25
 0
 49
-23
+26
 4
 15
 99
 7
-35
+40
 7
-36
+41
 65
 5
 49
-19
+22
 4
 15
 99
 7
-37
+42
 7
-38
+43
 65
-5
+67
 49
-19
+25
+0
+49
+26
 4
 15
 99
 7
-39
+44
 7
-40
+45
 65
-5
+67
 49
-19
+25
+0
+49
+26
 4
 15
 99
 7
-41
+46
 7
-42
+47
 65
-5
+67
 49
-19
+25
+0
+49
+26
 4
 15
 99
 7
-43
+48
 7
-44
+49
 65
-5
+67
 49
-19
+25
+0
+49
+26
 4
 15
 99
 7
-45
+50
 7
-46
+51
 65
-5
+67
 49
-19
+25
+0
+49
+26
 4
 15
 99
 7
-47
+52
 7
-48
+53
 65
-5
+67
 49
-19
+25
+0
+49
+26
 4
 15
 99
 7
+54
+7
+55
+65
+67
+49
+25
+0
 49
+26
+4
+15
+99
 7
-50
+56
+7
+57
 65
-5
+67
 49
-19
+25
+0
+49
+26
 4
 15
 99
 7
-51
+58
 7
-52
+59
 65
-5
+67
 49
-19
+25
+0
+49
+26
+4
+15
+99
+7
+60
+7
+61
+65
+67
+49
+25
+0
+49
+26
 4
 11
 I
@@ -430,12 +506,21 @@ I
 0
 n
 p
-53
+62
 x
-15
-VAILD_FILE_NAME
+3
+uri
 x
-6
+7
+options
+x
+13
+attr_accessor
+x
+15
+VAILD_FILE_NAME
+x
+6
 Regexp
 s
 2
@@ -479,129 +564,104 @@ s
 4
 .png
 x
-25
-find_all_sprite_map_files
+4
+load
 M
 1
 n
 n
 x
-25
-find_all_sprite_map_files
+4
+load
 i
-59
-7
+54
+45
 0
-64
-19
-1
-15
-7
 1
-20
-1
-4
-10
-49
+43
 2
-1
-47
-101
+13
+71
 3
-7
+47
+9
+23
+47
+49
 4
-45
-5
-6
-7
-7
-64
+0
+13
+47
 49
+5
+0
+15
 8
-1
-47
-101
+26
+49
 3
-7
-9
-63
-5
+0
 19
 2
 15
-45
-10
-11
-45
-12
-13
 20
 0
-7
-14
-64
 20
+1
+17
 2
+20
+2
+12
 49
-8
-3
-49
+6
+1
 15
+20
+2
+12
+49
+7
 1
+15
+2
+15
+20
+2
 11
 I
-8
+6
 I
 3
 I
-1
+2
 I
-1
+2
 n
 p
-16
-s
 8
-[0-9a-f]
-s
-3
-*-s
-x
-1
-*
-x
-4
-to_s
-s
-1
-{
 x
-16
-VALID_EXTENSIONS
+7
+Compass
 n
-s
-1
-,
 x
-4
-join
-s
-1
-}
+14
+SpriteImporter
 x
 3
-Dir
-n
+new
 x
-4
-File
-n
-s
-2
-**
+8
+allocate
+x
+10
+initialize
 x
 4
-glob
+uri=
+x
+8
+options=
 p
 9
 I
@@ -613,32 +673,229 @@ I
 I
 9
 I
-6
+1d
 I
 a
 I
-27
+33
 I
 b
 I
-3b
+36
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 3
 x
+3
+uri
+x
+7
+options
+x
+5
+klass
+x
+13
+attach_method
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+42
+23
+0
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+0
+15
+7
+2
+64
+44
+43
+0
+78
+49
+1
+1
+17
+2
+38
+3
+15
+38
 4
-path
+15
+2
+15
+20
+0
+56
+5
+50
+6
+0
+11
+I
+4
+I
+1
+I
+0
+I
+1
+n
+p
+7
+x
+4
+Hash
+x
+16
+new_from_literal
+s
+0
+
+x
+4
+@uri
+x
+8
+@options
+M
+1
+p
+2
 x
+9
+for_block
+t
+n
+x
+10
+initialize
+i
+27
+58
+37
+19
+0
+15
+37
+19
+1
+15
+15
+5
+20
+0
+47
+101
+0
+7
+1
+63
+2
+20
+1
+47
+49
+2
+2
+11
+I
+6
+I
+2
+I
+2
+I
+2
+n
+p
 3
-hex
 x
 4
-glob
+to_s
+s
+1
+=
+x
+4
+send
+p
+5
+I
+0
+I
+10
+I
+a
+I
+11
+I
+1b
+x
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+p
+2
+x
+3
+key
+x
+5
+value
+x
+4
+each
+p
+7
+I
+-1
+I
+e
+I
+e
+I
+f
+I
+22
+I
+10
+I
+2a
+x
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+p
+1
+x
+7
+options
+x
+17
+method_visibility
 x
-13
-attach_method
+15
+add_defn_method
 x
 4
 find
@@ -650,47 +907,41 @@ x
 4
 find
 i
-38
+32
 20
 0
-45
-0
+20
 1
-49
+17
 2
-1
-9
-34
-5
-49
-3
+38
 0
+15
+38
+1
+15
+2
+15
 20
 0
-5
-49
+45
+2
 3
-0
-20
-0
 49
 4
 1
+9
+30
 5
-20
-1
-49
+48
 5
-4
 11
 8
-35
-1
-15
+31
 1
 11
 I
-7
+4
 I
 2
 I
@@ -701,6 +952,12 @@ n
 p
 6
 x
+4
+@uri
+x
+8
+@options
+x
 21
 SPRITE_IMPORTER_REGEX
 n
@@ -708,45 +965,35 @@ x
 2
 =~
 x
-5
-class
-x
-11
-sprite_name
-x
 11
 sass_engine
 p
-13
+11
 I
 -1
 I
-e
+15
 I
 0
 I
-f
-I
-a
-I
-10
+16
 I
-22
+e
 I
-f
+17
 I
-23
+18
 I
-0
+18
 I
-24
+1e
 I
-12
+17
 I
-26
+20
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 2
 x
@@ -756,12 +1003,6 @@ x
 7
 options
 x
-17
-method_visibility
-x
-15
-add_defn_method
-x
 13
 find_relative
 M
@@ -772,11 +1013,41 @@ x
 13
 find_relative
 i
+32
+20
+0
+20
+2
+17
+2
+38
+0
+15
+38
+1
+15
+2
+15
+5
+45
 2
+3
+20
 1
+20
+0
+49
+4
+2
+20
+2
+47
+49
+5
+2
 11
 I
-4
+7
 I
 3
 I
@@ -785,22 +1056,42 @@ I
 3
 n
 p
-0
+6
+x
+4
+@uri
+x
+8
+@options
+x
+4
+File
+n
+x
+4
+join
+x
+4
+find
 p
-5
+7
 I
 -1
 I
-15
+1c
 I
 0
 I
-16
+1d
 I
-2
+e
+I
+1e
+I
+20
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 3
 x
@@ -851,16 +1142,16 @@ p
 I
 -1
 I
-19
+21
 I
 0
 I
-1a
+22
 I
 8
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 0
 x
@@ -911,16 +1202,16 @@ p
 I
 -1
 I
-1d
+25
 I
 0
 I
-1e
+26
 I
 b
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 0
 x
@@ -969,16 +1260,16 @@ p
 I
 -1
 I
-21
+29
 I
 0
 I
-22
+2a
 I
 c
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 1
 x
@@ -995,30 +1286,38 @@ x
 5
 mtime
 i
-25
-5
-49
-0
-0
+33
 20
 0
-49
+20
 1
+17
+2
+38
+0
+15
+38
 1
-49
+15
+2
+15
+5
+48
 2
+49
+3
 0
 45
-3
 4
+5
 78
 49
-5
+6
 1
 56
-6
-50
 7
+50
+8
 1
 11
 I
@@ -1031,10 +1330,13 @@ I
 2
 n
 p
-8
+9
 x
-5
-class
+4
+@uri
+x
+8
+@options
 x
 5
 files
@@ -1117,24 +1419,20 @@ x
 1
 >
 p
-7
+5
 I
 0
 I
-26
+2f
 I
 a
 I
-27
-I
-20
-I
-0
+30
 I
 21
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 3
 x
@@ -1150,20 +1448,24 @@ x
 6
 inject
 p
-5
+7
 I
 -1
 I
-25
+2d
 I
 0
 I
-26
+2e
 I
-19
+e
+I
+2f
+I
+21
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 2
 x
@@ -1183,7 +1485,7 @@ x
 3
 key
 i
-53
+67
 23
 1
 10
@@ -1198,41 +1500,55 @@ i
 19
 1
 15
+20
+0
+20
+1
+17
+2
+38
+2
+15
+38
+3
+15
+2
+15
 5
 49
-2
+4
 0
 49
-3
+5
 0
 7
-4
+6
 64
 81
-5
-45
-6
 7
 45
-6
 8
+9
+45
+8
+10
 20
 0
 49
-9
+11
 1
 49
-10
+12
 1
 81
-5
+7
 45
-6
-11
+8
+13
 20
 0
 49
-12
+14
 1
 35
 2
@@ -1247,7 +1563,7 @@ I
 2
 n
 p
-13
+15
 x
 4
 Hash
@@ -1255,14 +1571,20 @@ x
 16
 new_from_literal
 x
+4
+@uri
+x
+8
+@options
+x
 5
 class
 x
 4
 name
 s
-8
-:sprite:
+1
+:
 x
 1
 +
@@ -1282,20 +1604,24 @@ x
 8
 basename
 p
-5
+7
 I
 -1
 I
-2b
+34
 I
 e
 I
-2c
-I
 35
+I
+1c
+I
+36
+I
+43
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 2
 x
@@ -1315,7 +1641,7 @@ x
 13
 path_and_name
 i
-40
+41
 20
 0
 45
@@ -1341,20 +1667,21 @@ i
 35
 2
 8
-39
+40
 5
 45
 4
 5
-43
-6
-7
 7
+6
 64
+49
+7
+1
 47
 49
 8
-2
+1
 11
 I
 4
@@ -1381,125 +1708,102 @@ x
 7
 Compass
 n
-x
-5
-Error
 s
 19
 invalid sprite path
 x
 5
+Error
+x
+5
 raise
 p
-11
+9
 I
 -1
 I
-2f
+39
 I
 0
 I
-30
+3a
 I
 a
 I
-31
+3b
 I
 1a
 I
-33
-I
-27
-I
-0
+3d
 I
-28
+29
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 1
 x
 3
 uri
 x
-11
-sprite_name
+4
+name
 M
 1
 n
 n
 x
-11
-sprite_name
+4
+name
 i
-22
+9
 5
-20
-0
 47
 49
 0
-1
-97
-37
-19
-1
-15
-37
-19
-2
-15
-15
-2
+0
 15
-20
-2
+39
+1
 11
 I
-5
+1
 I
-3
+0
 I
-1
+0
 I
-1
+0
 n
 p
-1
+2
 x
-13
-path_and_name
+21
+ensure_path_and_name!
+x
+5
+@name
 p
 7
 I
 -1
 I
-38
+42
 I
 0
 I
-39
+43
 I
-13
+6
 I
-3a
+44
 I
-16
+9
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
-3
-x
-3
-uri
-x
-1
-_
-x
-4
-name
+0
 x
 4
 path
@@ -1511,121 +1815,187 @@ x
 4
 path
 i
-22
+9
 5
-20
-0
 47
 49
 0
+0
+15
+39
 1
-97
-37
-19
+11
+I
 1
-15
-37
-19
+I
+0
+I
+0
+I
+0
+n
+p
 2
-15
-15
+x
+21
+ensure_path_and_name!
+x
+5
+@path
+p
+7
+I
+-1
+I
+48
+I
+0
+I
+49
+I
+6
+I
+4a
+I
+9
+x
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+p
+0
+x
+5
+files
+M
+1
+n
+n
+x
+5
+files
+i
+28
+45
+0
+1
+45
 2
-15
-20
+3
+45
+4
+5
+49
+6
+0
+49
+7
+0
+5
+48
+8
+49
+9
+2
+49
+10
 1
+49
+11
+0
 11
 I
-5
+4
 I
-3
+0
 I
-1
+0
 I
-1
+0
 n
 p
-1
+12
+x
+3
+Dir
+n
+x
+4
+File
+n
+x
+7
+Compass
+n
+x
+13
+configuration
+x
+11
+images_path
+x
+3
+uri
+x
+4
+join
 x
-13
-path_and_name
+2
+[]
+x
+4
+sort
 p
-7
+5
 I
 -1
 I
-3e
+4e
 I
 0
 I
-3f
-I
-13
-I
-40
+4f
 I
-16
+1c
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
-3
-x
-3
-uri
-x
-4
-path
-x
-1
-_
+0
 x
-5
-files
+12
+sprite_names
 M
 1
 n
 n
 x
-5
-files
+12
+sprite_names
 i
-15
-45
-0
-1
-49
-2
-0
-49
-3
+9
+5
+48
 0
 56
-4
+1
 50
-5
+2
 0
 11
 I
-3
+2
 I
-1
+0
 I
-1
+0
 I
-1
+0
 n
 p
-6
-x
-7
-Compass
-n
-x
-13
-configuration
+3
 x
-16
-sprite_load_path
+5
+files
 M
 1
 p
@@ -1636,10 +2006,10 @@ for_block
 t
 n
 x
-5
-files
+12
+sprite_names
 i
-44
+60
 57
 19
 0
@@ -1647,45 +2017,61 @@ i
 45
 0
 1
-45
-2
-3
 20
 0
-21
-1
-0
-49
-4
+7
 2
+64
 49
-5
-1
-49
-6
-0
+3
+2
 19
 1
 15
+45
+4
+5
 20
 1
 49
-7
-0
+6
+1
 9
-38
+31
 1
-11
 8
-39
+56
+5
+45
+7
+8
+43
+9
+7
+10
+45
+0
+11
+20
+0
+49
+3
 1
+47
+101
+12
+63
+2
+47
+49
+13
+2
 15
 20
 1
-31
 11
 I
-7
+8
 I
 2
 I
@@ -1694,104 +2080,111 @@ I
 1
 n
 p
-8
-x
-3
-Dir
-n
+14
 x
 4
 File
 n
-x
+s
 4
-join
+.png
+x
+8
+basename
+x
+15
+VAILD_FILE_NAME
+n
 x
 2
-[]
+=~
+x
+7
+Compass
+n
+x
+5
+Error
+s
+63
+Sprite file names must be legal css identifiers. Please rename 
+n
 x
 4
-sort
+to_s
 x
-6
-empty?
+5
+raise
 p
 11
 I
 0
 I
-45
+54
 I
 4
 I
-46
+55
 I
-1b
+12
 I
-47
+56
 I
-27
+1f
 I
-0
+57
 I
-28
+39
 I
-48
+59
 I
-2c
+3c
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 2
 x
-6
-folder
+4
+file
 x
-5
-files
+8
+filename
 x
-4
-each
+7
+collect
 p
 5
 I
 -1
 I
-44
+53
 I
 0
 I
-45
+54
 I
-f
+9
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
-1
-x
-3
-uri
+0
 x
-12
-sprite_names
+17
+validate_sprites!
 M
 1
 n
 n
 x
-12
-sprite_names
+17
+validate_sprites!
 i
-13
+9
 5
-20
-0
-47
-49
+48
 0
-1
 56
 1
 50
@@ -1799,13 +2192,13 @@ i
 0
 11
 I
-3
+2
 I
-1
+0
 I
-1
+0
 I
-1
+0
 n
 p
 3
@@ -1822,10 +2215,10 @@ for_block
 t
 n
 x
-12
-sprite_names
+17
+validate_sprites!
 i
-60
+52
 57
 19
 0
@@ -1833,87 +2226,76 @@ i
 45
 0
 1
-20
-0
-7
+45
 2
-64
-49
 3
-2
-19
-1
-15
-45
-4
-5
 20
+0
+49
+4
 1
 49
-6
+5
 1
 9
-31
+23
 1
 8
-56
+51
 5
 45
+6
 7
-8
 43
-9
+8
 7
-10
+9
 45
 0
+10
+7
 11
-20
-0
+64
 49
-3
+12
 1
 47
 101
-12
+13
+7
+14
 63
-2
+3
 47
 49
-13
-2
 15
-20
-1
+2
 11
 I
-8
+7
 I
-2
+1
 I
 1
 I
 1
 n
 p
-14
+16
+x
+16
+VALID_EXTENSIONS
+n
 x
 4
 File
 n
-s
-4
-.png
 x
-8
-basename
-x
-15
-VAILD_FILE_NAME
-n
+7
+extname
 x
-2
-=~
+8
+include?
 x
 7
 Compass
@@ -1922,77 +2304,68 @@ x
 5
 Error
 s
-63
-Sprite file names must be legal css identifiers. Please rename 
+31
+Invalid sprite extension only: 
 n
+s
+1
+,
+x
+4
+join
 x
 4
 to_s
+s
+19
+ images are allowed
 x
 5
 raise
 p
-13
+7
 I
 0
 I
-4e
+5e
 I
 4
 I
-4f
-I
-12
-I
-50
-I
-1f
-I
-51
-I
-38
-I
-0
+5f
 I
-39
+17
 I
-53
+60
 I
-3c
+34
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
-2
+1
 x
 4
 file
 x
-8
-filename
-x
-7
-collect
+4
+each
 p
 5
 I
 -1
 I
-4d
+5d
 I
 0
 I
-4e
+5e
 I
-d
+9
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
-1
-x
-3
-uri
+0
 x
 12
 sass_options
@@ -2004,59 +2377,63 @@ x
 12
 sass_options
 i
-41
-20
-2
+42
+5
+48
+0
 44
 43
-0
+1
 4
 3
 49
-1
+2
 1
 13
 7
-2
-20
-0
-49
 3
+5
+48
+4
+49
+5
 2
 15
 13
 7
-4
+6
+7
 7
-5
 49
-3
+5
 2
 15
 13
 7
-6
-20
-1
+8
+5
 49
-3
+5
 2
 15
 49
-7
+9
 1
 11
 I
-8
+5
 I
-3
+0
 I
-3
+0
 I
-3
+0
 n
 p
-8
+10
+x
+7
+options
 x
 4
 Hash
@@ -2067,6 +2444,9 @@ x
 8
 filename
 x
+4
+name
+x
 3
 []=
 x
@@ -2079,34 +2459,25 @@ x
 8
 importer
 x
-6
-merge!
+5
+merge
 p
 5
 I
 -1
 I
-58
+66
 I
 0
 I
-59
+67
 I
-29
+2a
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
-3
-x
-3
-uri
-x
-8
-importer
-x
-7
-options
+0
 x
 11
 sass_engine
@@ -2118,99 +2489,66 @@ x
 11
 sass_engine
 i
-72
+45
 5
-20
-0
-20
-1
-20
-3
-7
-0
-49
-1
-1
 47
 49
-2
-3
-19
-4
+0
+0
 15
 45
-3
-4
+1
+2
 43
-5
+3
 13
 71
-6
+4
 47
 9
-55
+35
 47
 49
-7
+5
 0
 13
-20
-4
 5
-20
-0
-20
-2
-20
-3
+48
+6
+5
+48
+7
 47
 49
 8
-3
-47
-49
-9
 2
 15
 8
-71
-20
-4
+44
 5
-20
-0
-20
-2
-20
-3
-47
-49
-8
-3
-49
+48
 6
+5
+48
+7
+49
+4
 2
 11
 I
-c
+4
 I
-5
+0
 I
-4
+0
 I
-4
+0
 n
 p
-10
-x
-14
-skip_overrides
-x
-2
-[]
+9
 x
-18
-content_for_images
+17
+validate_sprites!
 x
 4
 Sass
@@ -2225,6 +2563,9 @@ x
 8
 allocate
 x
+18
+content_for_images
+x
 12
 sass_options
 x
@@ -2235,37 +2576,99 @@ p
 I
 -1
 I
-5d
+6b
 I
 0
 I
-5e
+6c
 I
-13
+6
 I
-5f
+6d
 I
-48
+2d
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+p
+0
+x
+21
+ensure_path_and_name!
+M
+1
+n
+n
+x
+21
+ensure_path_and_name!
+i
+22
+5
+49
+0
+0
+5
+48
+1
+49
+2
+1
+97
+37
+38
+3
+15
+37
+38
+4
+15
+15
+2
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
 p
 5
 x
+5
+class
+x
 3
 uri
 x
-4
-name
+13
+path_and_name
 x
-8
-importer
+5
+@path
 x
-7
-options
+5
+@name
+p
+5
+I
+-1
+I
+70
+I
+0
+I
+71
+I
+16
 x
-7
-content
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
+p
+0
 x
 18
 content_for_images
@@ -2277,279 +2680,286 @@ x
 18
 content_for_images
 i
-286
+293
 23
-2
+0
 10
 8
 3
 19
-2
+0
 15
 7
 0
-20
+5
+48
 1
 47
 101
-1
-7
 2
-20
-1
-47
-101
-1
 7
 3
-20
+5
+48
 1
 47
 101
-1
+2
 7
 4
-20
+5
+48
 1
 47
 101
-1
+2
 7
 5
-20
+5
+48
 1
 47
 101
-1
+2
 7
 6
-20
+5
+48
 1
 47
 101
-1
+2
 7
 7
-20
+5
+48
 1
 47
 101
-1
+2
 7
 8
-20
+5
+48
 1
 47
 101
-1
+2
 7
 9
-20
+5
+48
 1
 47
 101
-1
+2
 7
 10
 20
-2
+0
 9
-111
+108
 7
 11
-20
+5
+48
 1
 47
 101
-1
+2
 7
 12
-20
-0
-47
-101
-1
-7
+5
+48
 13
-20
-1
 47
 101
-1
+2
 7
 14
-20
+5
+48
 1
 47
 101
-1
+2
 7
 15
 63
-9
+7
 8
-120
+111
 5
-20
-0
-20
-1
-47
-49
+48
 16
-2
 47
 101
-1
+2
 7
 17
-20
+5
+48
 1
 47
 101
-1
+2
 7
 18
-20
+5
+48
 1
 47
 101
-1
+2
 7
 19
-20
+5
+48
 1
 47
 101
-1
+2
 7
 20
-20
+5
+48
 1
 47
 101
-1
+2
 7
 21
-20
+5
+48
 1
 47
 101
-1
+2
 7
 22
-20
+5
+48
 1
 47
 101
-1
+2
 7
 23
-20
+5
+48
 1
 47
 101
-1
+2
 7
 24
-20
+5
+48
 1
 47
 101
-1
+2
 7
 25
-20
+5
+48
 1
 47
 101
-1
+2
 7
 26
-20
+5
+48
 1
 47
 101
-1
+2
 7
 27
-20
+5
+48
 1
 47
 101
-1
+2
 7
 28
-20
+5
+48
 1
 47
 101
-1
+2
 7
 29
-20
+5
+48
 1
 47
 101
-1
+2
 7
 30
-20
+5
+48
 1
 47
 101
-1
+2
 7
 31
-20
+5
+48
 1
 47
 101
-1
+2
 7
 32
-20
+5
+48
 1
 47
 101
-1
+2
 7
 33
-20
+5
+48
 1
 47
 101
-1
+2
 7
 34
-20
+5
+48
 1
 47
 101
-1
+2
 7
 30
-20
+5
+48
 1
 47
 101
-1
+2
 7
 35
-20
+5
+48
 1
 47
 101
-1
+2
 7
 36
 5
-20
-0
-47
-49
+48
 37
-1
 7
 38
 64
@@ -2558,20 +2968,20 @@ i
 1
 47
 101
-1
+2
 7
 40
 63
-63
+61
 11
 I
-42
+3e
 I
-3
+1
 I
-2
+0
 I
-3
+1
 n
 p
 41
@@ -2584,6 +2994,9 @@ s
 $
 x
 4
+name
+x
+4
 to_s
 s
 22
@@ -2615,10 +3028,6 @@ $
 s
 27
 -clean-up: true !default;
-$
-s
-29
--layout: vertical !default;
 
 
 s
@@ -2627,12 +3036,12 @@ $
 s
 22
 -sprites: sprite-map("
+x
+3
+uri
 s
-13
-", $layout: $
-s
-20
--layout, $cleanup: $
+14
+", $cleanup: $
 s
 11
 -clean-up);
@@ -2708,15 +3117,15 @@ s
 46
 -sprite-dimensions, $prefix: sprite-map-name($
 s
-61
--sprites), $offset-x: 0, $offset-y: 0) {
+33
+-sprites)) {
   @include sprites($
 s
 26
 -sprites, $sprite-names, $
 s
-123
--sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y)
+101
+-sprite-base-class, $dimensions, $prefix)
 }
 
 // Generates a class for each sprited image.
@@ -2725,8 +3134,8 @@ s
 23
 -sprites($dimensions: $
 s
-52
--sprites), $offset-x: 0, $offset-y: 0) {
+24
+-sprites)) {
   @include 
 s
 9
@@ -2741,125 +3150,111 @@ x
 4
 join
 s
-49
-, $dimensions, $prefix, $offset-x, $offset-y);
+27
+, $dimensions, $prefix);
 }
 
 p
-51
+47
 I
 -1
 I
-63
+75
 I
 8
 I
-69
-I
-18
-I
-6a
+7b
 I
-1f
+1a
 I
-6b
+7c
 I
-26
+22
 I
-6c
+7d
 I
-2d
+2a
 I
-6d
+7e
 I
-34
+32
 I
-6e
+7f
 I
-3b
+3a
 I
-6f
+80
 I
 42
 I
-70
+81
 I
-49
+4a
 I
-72
+83
 I
-78
+74
 I
-0
+86
 I
-7d
+7c
 I
-75
+87
 I
 84
 I
-76
-I
-8b
-I
-77
+88
 I
-92
+8c
 I
-7c
+8d
 I
-99
+94
 I
-7d
+8e
 I
-a0
+9c
 I
-81
+92
 I
-a7
+a4
 I
-82
+93
 I
-ae
+ac
 I
-87
+98
 I
 bc
 I
-88
+99
 I
-c3
+c4
 I
-89
+9a
 I
-ca
+cc
 I
-8c
+9d
 I
-df
+e4
 I
-8d
+9e
 I
-ed
+f4
 I
-91
+a2
 I
-102
+10c
 I
-92
+a3
 I
-11e
+125
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
-3
-x
-3
-uri
-x
-4
-name
+1
 x
 14
 skip_overrides
@@ -2874,25 +3269,16 @@ x
 18
 generate_overrides
 i
-96
-5
-20
-0
-47
-49
-0
-1
-19
-2
-15
+84
 7
-1
+0
 64
 19
-3
+0
 15
-20
-2
+5
+48
+1
 56
 2
 50
@@ -2903,93 +3289,90 @@ i
 0
 15
 20
-3
+0
 7
 5
-20
-1
-47
-101
+5
+48
 6
-7
-7
-20
-0
 47
 101
-6
+7
 7
 8
-20
-1
+5
+48
+9
 47
 101
-6
 7
-9
-20
-1
+7
+10
+5
+48
+6
 47
 101
-6
 7
-10
+7
+11
 63
-9
+7
 81
-11
+12
 19
-3
+0
 15
 20
-3
-20
-2
+0
+5
+48
+1
 56
-12
+13
 50
 3
 0
 7
-13
+14
 64
 49
 4
 1
 81
-11
+12
 19
-3
+0
 15
 20
-3
+0
 7
-14
+15
 64
 81
-11
+12
 19
-3
+0
 11
 I
-e
+9
 I
-4
+1
 I
-2
+0
 I
-2
+0
 n
 p
-15
-x
-12
-sprite_names
+16
 s
 121
 // These variables control the generated sprite output
 // You can override them selectively before you import this file.
 
+x
+12
+sprite_names
 M
 1
 p
@@ -3010,85 +3393,85 @@ i
 15
 21
 1
-3
+0
 7
 0
-21
-1
+5
+48
 1
 47
 101
-1
-7
 2
-20
-0
-47
-101
-1
 7
-3
-21
-1
-1
+3
+20
+0
 47
 101
-1
+2
 7
 4
-21
-1
+5
+48
 1
 47
 101
-1
+2
 7
+5
+5
+48
+1
+47
+101
 2
+7
+3
 20
 0
 47
 101
-1
+2
 7
+6
 5
-21
-1
+48
 1
 47
 101
-1
+2
 7
-6
-21
-1
+7
+5
+48
 1
 47
 101
-1
-7
 2
+7
+3
 20
 0
 47
 101
-1
-7
+2
 7
-21
-1
+8
+5
+48
 1
 47
 101
-1
+2
 7
-8
+9
 63
 19
 81
-9
+10
 22
 1
-3
+0
 11
 I
 16
@@ -3100,12 +3483,15 @@ I
 1
 n
 p
-10
+11
 s
 1
 $
 x
 4
+name
+x
+4
 to_s
 s
 1
@@ -3139,32 +3525,32 @@ p
 I
 0
 I
-a1
+b1
 I
 4
 I
-a2
+b2
 I
 7
 I
-a3
+b3
 I
 20
 I
-a4
+b4
 I
 37
 I
-a5
+b5
 I
 52
 I
-a2
+b2
 I
 56
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 1
 x
@@ -3182,18 +3568,20 @@ s
 $
 x
 4
+name
+x
+4
 to_s
 s
 22
 -sprites: sprite-map("
+x
+3
+uri
 s
-16
+15
 ", 
-  $layout: $
-s
-23
--layout, 
-  $cleanup: $
+$cleanup: $
 s
 11
 -clean-up,
@@ -3214,108 +3602,84 @@ x
 18
 generate_overrides
 i
-99
+75
 57
 19
 0
 15
 7
 0
-21
-1
-1
-47
-101
-1
-7
-2
 20
 0
 47
 101
 1
 7
+2
+5
+48
 3
-21
-1
-1
 47
 101
 1
 7
-2
+4
 20
 0
 47
 101
 1
 7
-4
-21
-1
-1
-47
-101
-1
-7
-2
+5
 20
 0
 47
 101
 1
 7
+6
 5
-21
-1
-1
+48
+3
 47
 101
 1
 7
-2
+4
 20
 0
 47
 101
 1
 7
-6
-21
-1
-1
-47
-101
-1
 7
-2
 20
 0
 47
 101
 1
 7
-7
-21
-1
-1
+8
+5
+48
+3
 47
 101
 1
 7
-2
+4
 20
 0
 47
 101
 1
 7
-8
+9
 63
-25
+19
 11
 I
-1b
+15
 I
 1
 I
@@ -3324,7 +3688,7 @@ I
 1
 n
 p
-9
+10
 s
 3
   $
@@ -3332,11 +3696,14 @@ x
 4
 to_s
 s
-1
--
-s
 12
 -position: $
+x
+4
+name
+s
+1
+-
 s
 14
 -position,
@@ -3359,24 +3726,24 @@ p
 I
 0
 I
-aa
+ba
 I
 4
 I
-ab
+bb
 I
-24
+1c
 I
-ac
+bc
 I
-42
+32
 I
-ad
+bd
 I
-63
+4b
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 1
 x
@@ -3390,153 +3757,156 @@ s
 2
 );
 p
-21
+19
 I
 -1
 I
-9b
+ac
 I
 0
 I
-9c
-I
-a
-I
-9d
+ad
 I
-10
+6
 I
-a1
+b1
 I
-1b
+12
 I
-a9
+b9
 I
-42
+35
 I
-ae
+be
 I
-44
+37
 I
-aa
+ba
 I
-4b
+3f
 I
-ae
+be
 I
-4e
+42
 I
-aa
+ba
 I
-56
+4a
 I
-af
+bf
 I
-60
+54
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
-4
-x
-3
-uri
-x
-4
-name
-x
-7
-sprites
+1
 x
 7
 content
 p
-41
+49
 I
 2
 I
 3
 I
-22
+c
 I
 4
 I
-3b
+2c
 I
 5
 I
-47
+45
+I
+6
+I
+51
 I
 8
 I
-52
+5c
 I
 e
 I
-60
+6a
 I
 15
 I
-6e
-I
-19
-I
-7c
+78
 I
-1d
+1c
 I
-8a
+86
 I
 21
 I
-98
+94
 I
 25
 I
-a6
+a2
 I
-2b
+29
 I
-b4
+b0
 I
-2f
+2d
 I
-bf
+be
 I
-38
+34
 I
-ca
+cc
 I
-3e
+39
 I
-d5
+d7
 I
-44
+42
 I
-e0
+e5
 I
-4d
+48
 I
-eb
+f3
 I
-58
+4e
 I
-f6
+101
+I
+53
+I
+10f
 I
 5d
 I
-101
+11d
 I
-63
+66
 I
-10c
+12b
 I
-9b
+6b
+I
+139
+I
+70
+I
+147
+I
+75
+I
+155
 I
-117
+ac
+I
+163
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 0
 x
@@ -3551,8 +3921,8 @@ I
 I
 23
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 0
 x
@@ -3567,7 +3937,7 @@ I
 I
 1c
 x
-62
-/Users/crispee/Projects/compass/lib/compass/sprite_importer.rb
+60
+/Users/chris/Projects/compass/lib/compass/sprite_importer.rb
 p
 0