haml 3.2.0.alpha.10 → 3.2.0.alpha.13

data/vendor/sass/lib/sass/script/literal.rb

@@ -1,250 +0,0 @@
-module Sass::Script
-  # The abstract superclass for SassScript objects.
-  #
-  # Many of these methods, especially the ones that correspond to SassScript operations,
-  # are designed to be overridden by subclasses which may change the semantics somewhat.
-  # The operations listed here are just the defaults.
-  class Literal < Node
-    require 'sass/script/string'
-    require 'sass/script/number'
-    require 'sass/script/color'
-    require 'sass/script/bool'
-    require 'sass/script/list'
-
-    # Returns the Ruby value of the literal.
-    # The type of this value varies based on the subclass.
-    #
-    # @return [Object]
-    attr_reader :value
-
-    # Creates a new literal.
-    #
-    # @param value [Object] The object for \{#value}
-    def initialize(value = nil)
-      @value = value
-      super()
-    end
-
-    # Returns an empty array.
-    #
-    # @return [Array<Node>] empty
-    # @see Node#children
-    def children
-      []
-    end
-
-    # @see Node#deep_copy
-    def deep_copy
-      dup
-    end
-
-    # Returns the options hash for this node.
-    #
-    # @return [{Symbol => Object}]
-    # @raise [Sass::SyntaxError] if the options hash hasn't been set.
-    #   This should only happen when the literal was created
-    #   outside of the parser and \{#to\_s} was called on it
-    def options
-      opts = super
-      return opts if opts
-      raise Sass::SyntaxError.new(<<MSG)
-The #options attribute is not set on this #{self.class}.
-  This error is probably occurring because #to_s was called
-  on this literal within a custom Sass function without first
-  setting the #option attribute.
-MSG
-    end
-
-    # The SassScript `and` operation.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of a logical and:
-    #   `other` if this literal isn't a false {Bool},
-    #   and this literal otherwise
-    def and(other)
-      to_bool ? other : self
-    end
-
-    # The SassScript `or` operation.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the logical or:
-    #   this literal if it isn't a false {Bool},
-    #   and `other` otherwise
-    def or(other)
-      to_bool ? self : other
-    end
-
-    # The SassScript `==` operation.
-    # **Note that this returns a {Sass::Script::Bool} object,
-    # not a Ruby boolean**.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Bool] True if this literal is the same as the other,
-    #   false otherwise
-    def eq(other)
-      Sass::Script::Bool.new(self.class == other.class && self.value == other.value)
-    end
-
-    # The SassScript `!=` operation.
-    # **Note that this returns a {Sass::Script::Bool} object,
-    # not a Ruby boolean**.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Bool] False if this literal is the same as the other,
-    #   true otherwise
-    def neq(other)
-      Sass::Script::Bool.new(!eq(other).to_bool)
-    end
-
-    # The SassScript `==` operation.
-    # **Note that this returns a {Sass::Script::Bool} object,
-    # not a Ruby boolean**.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Bool] True if this literal is the same as the other,
-    #   false otherwise
-    def unary_not
-      Sass::Script::Bool.new(!to_bool)
-    end
-
-    # The SassScript default operation (e.g. `$a $b`, `"foo" "bar"`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by a space
-    def space(other)
-      Sass::Script::String.new("#{self.to_s} #{other.to_s}")
-    end
-
-    # The SassScript `,` operation (e.g. `$a, $b`, `"foo", "bar"`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by `", "`
-    def comma(other)
-      Sass::Script::String.new("#{self.to_s},#{' ' unless options[:style] == :compressed}#{other.to_s}")
-    end
-
-    # The SassScript `=` operation
-    # (used for proprietary MS syntax like `alpha(opacity=20)`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by `"="`
-    def single_eq(other)
-      Sass::Script::String.new("#{self.to_s}=#{other.to_s}")
-    end
-
-    # The SassScript `+` operation.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   without any separation
-    def plus(other)
-      if other.is_a?(Sass::Script::String)
-        return Sass::Script::String.new(self.to_s + other.value, other.type)
-      end
-      Sass::Script::String.new(self.to_s + other.to_s)
-    end
-
-    # The SassScript `-` operation.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by `"-"`
-    def minus(other)
-      Sass::Script::String.new("#{self.to_s}-#{other.to_s}")
-    end
-
-    # The SassScript `/` operation.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by `"/"`
-    def div(other)
-      Sass::Script::String.new("#{self.to_s}/#{other.to_s}")
-    end
-
-    # The SassScript unary `+` operation (e.g. `+$a`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing the literal
-    #   preceded by `"+"`
-    def unary_plus
-      Sass::Script::String.new("+#{self.to_s}")
-    end
-
-    # The SassScript unary `-` operation (e.g. `-$a`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing the literal
-    #   preceded by `"-"`
-    def unary_minus
-      Sass::Script::String.new("-#{self.to_s}")
-    end
-
-    # The SassScript unary `/` operation (e.g. `/$a`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing the literal
-    #   preceded by `"/"`
-    def unary_div
-      Sass::Script::String.new("/#{self.to_s}")
-    end
-
-    # @return [String] A readable representation of the literal
-    def inspect
-      value.inspect
-    end
-
-    # @return [Boolean] `true` (the Ruby boolean value)
-    def to_bool
-      true
-    end
-
-    # Compares this object with another.
-    #
-    # @param other [Object] The object to compare with
-    # @return [Boolean] Whether or not this literal is equivalent to `other`
-    def ==(other)
-      eq(other).to_bool
-    end
-
-    # @return [Fixnum] The integer value of this literal
-    # @raise [Sass::SyntaxError] if this literal isn't an integer
-    def to_i
-      raise Sass::SyntaxError.new("#{self.inspect} is not an integer.")
-    end
-
-    # @raise [Sass::SyntaxError] if this literal isn't an integer
-    def assert_int!; to_i; end
-
-    # Returns the value of this literal as a list.
-    # Single literals are considered the same as single-element lists.
-    #
-    # @return [Array<Literal>] The of this literal as a list
-    def to_a
-      [self]
-    end
-
-    # Returns the string representation of this literal
-    # as it would be output to the CSS document.
-    #
-    # @return [String]
-    def to_s(opts = {})
-      raise Sass::SyntaxError.new("[BUG] All subclasses of Sass::Literal must implement #to_s.")
-    end
-    alias_method :to_sass, :to_s
-
-    protected
-
-    # Evaluates the literal.
-    #
-    # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
-    # @return [Literal] This literal
-    def _perform(environment)
-      self
-    end
-  end
-end

data/vendor/sass/lib/sass/script/node.rb

@@ -1,99 +0,0 @@
-module Sass::Script
-  # The abstract superclass for SassScript parse tree nodes.
-  #
-  # Use \{#perform} to evaluate a parse tree.
-  class Node
-    # The options hash for this node.
-    #
-    # @return [{Symbol => Object}]
-    attr_reader :options
-
-    # The line of the document on which this node appeared.
-    #
-    # @return [Fixnum]
-    attr_accessor :line
-
-    # Sets the options hash for this node,
-    # as well as for all child nodes.
-    # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
-    #
-    # @param options [{Symbol => Object}] The options
-    def options=(options)
-      @options = options
-      children.each do |c|
-        if c.is_a? Hash
-          c.values.each {|v| v.options = options }
-        else
-          c.options = options
-        end
-      end
-    end
-
-    # Evaluates the node.
-    #
-    # \{#perform} shouldn't be overridden directly;
-    # instead, override \{#\_perform}.
-    #
-    # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
-    # @return [Literal] The SassScript object that is the value of the SassScript
-    def perform(environment)
-      _perform(environment)
-    rescue Sass::SyntaxError => e
-      e.modify_backtrace(:line => line)
-      raise e
-    end
-
-    # Returns all child nodes of this node.
-    #
-    # @return [Array<Node>]
-    def children
-      Sass::Util.abstract(self)
-    end
-
-    # Returns the text of this SassScript expression.
-    #
-    # @return [String]
-    def to_sass(opts = {})
-      Sass::Util.abstract(self)
-    end
-
-    # Returns a deep clone of this node.
-    # The child nodes are cloned, but options are not.
-    #
-    # @return [Node]
-    def deep_copy
-      Sass::Util.abstract(self)
-    end
-
-    protected
-
-    # Converts underscores to dashes if the :dasherize option is set.
-    def dasherize(s, opts)
-      if opts[:dasherize]
-        s.gsub(/_/,'-')
-      else
-        s
-      end
-    end
-
-    # Evaluates this node.
-    # Note that all {Literal} objects created within this method
-    # should have their \{#options} attribute set, probably via \{#opts}.
-    #
-    # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
-    # @return [Literal] The SassScript object that is the value of the SassScript
-    # @see #perform
-    def _perform(environment)
-      Sass::Util.abstract(self)
-    end
-
-    # Sets the \{#options} field on the given literal and returns it
-    #
-    # @param literal [Literal]
-    # @return [Literal]
-    def opts(literal)
-      literal.options = options
-      literal
-    end
-  end
-end

data/vendor/sass/lib/sass/script/number.rb

@@ -1,452 +0,0 @@
-require 'sass/script/literal'
-
-module Sass::Script
-  # A SassScript object representing a number.
-  # SassScript numbers can have decimal values,
-  # and can also have units.
-  # For example, `12`, `1px`, and `10.45em`
-  # are all valid values.
-  #
-  # Numbers can also have more complex units, such as `1px*em/in`.
-  # These cannot be inputted directly in Sass code at the moment.
-  class Number < Literal
-    # The Ruby value of the number.
-    #
-    # @return [Numeric]
-    attr_reader :value
-
-    # A list of units in the numerator of the number.
-    # For example, `1px*em/in*cm` would return `["px", "em"]`
-    # @return [Array<String>] 
-    attr_reader :numerator_units
-
-    # A list of units in the denominator of the number.
-    # For example, `1px*em/in*cm` would return `["in", "cm"]`
-    # @return [Array<String>]
-    attr_reader :denominator_units
-
-    # The original representation of this number.
-    # For example, although the result of `1px/2px` is `0.5`,
-    # the value of `#original` is `"1px/2px"`.
-    #
-    # This is only non-nil when the original value should be used as the CSS value,
-    # as in `font: 1px/2px`.
-    #
-    # @return [Boolean, nil]
-    attr_accessor :original
-
-    def self.precision
-      @precision ||= 3
-    end
-
-    # Sets the number of digits of precision
-    # For example, if this is `3`,
-    # `3.1415926` will be printed as `3.142`.
-    def self.precision=(digits)
-      @precision = digits.round
-      @precision_factor = 10.0**@precision
-    end
-
-    # the precision factor used in numeric output
-    # it is derived from the `precision` method.
-    def self.precision_factor
-      @precision_factor ||= 10.0**precision
-    end
-
-    # Handles the deprecation warning for the PRECISION constant
-    # This can be removed in 3.2.
-    def self.const_missing(const)
-      if const == :PRECISION
-        Sass::Util.sass_warn("Sass::Script::Number::PRECISION is deprecated and will be removed in a future release. Use Sass::Script::Number.precision_factor instead.")
-        const_set(:PRECISION, self.precision_factor)
-      else
-        super
-      end
-    end
-
-    # Used so we don't allocate two new arrays for each new number.
-    NO_UNITS  = []
-
-    # @param value [Numeric] The value of the number
-    # @param numerator_units [Array<String>] See \{#numerator\_units}
-    # @param denominator_units [Array<String>] See \{#denominator\_units}
-    def initialize(value, numerator_units = NO_UNITS, denominator_units = NO_UNITS)
-      super(value)
-      @numerator_units = numerator_units
-      @denominator_units = denominator_units
-      normalize!
-    end
-
-    # The SassScript `+` operation.
-    # Its functionality depends on the type of its argument:
-    #
-    # {Number}
-    # : Adds the two numbers together, converting units if possible.
-    #
-    # {Color}
-    # : Adds this number to each of the RGB color channels.
-    #
-    # {Literal}
-    # : See {Literal#plus}.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
-    # @raise [Sass::UnitConversionError] if `other` is a number with incompatible units
-    def plus(other)
-      if other.is_a? Number
-        operate(other, :+)
-      elsif other.is_a?(Color)
-        other.plus(self)
-      else
-        super
-      end
-    end
-
-    # The SassScript binary `-` operation (e.g. `$a - $b`).
-    # Its functionality depends on the type of its argument:
-    #
-    # {Number}
-    # : Subtracts this number from the other, converting units if possible.
-    #
-    # {Literal}
-    # : See {Literal#minus}.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
-    # @raise [Sass::UnitConversionError] if `other` is a number with incompatible units
-    def minus(other)
-      if other.is_a? Number
-        operate(other, :-)
-      else
-        super
-      end
-    end
-
-    # The SassScript unary `+` operation (e.g. `+$a`).
-    #
-    # @return [Number] The value of this number
-    def unary_plus
-      self
-    end
-
-    # The SassScript unary `-` operation (e.g. `-$a`).
-    #
-    # @return [Number] The negative value of this number
-    def unary_minus
-      Number.new(-value, @numerator_units, @denominator_units)
-    end
-
-    # The SassScript `*` operation.
-    # Its functionality depends on the type of its argument:
-    #
-    # {Number}
-    # : Multiplies the two numbers together, converting units appropriately.
-    #
-    # {Color}
-    # : Multiplies each of the RGB color channels by this number.
-    #
-    # @param other [Number, Color] The right-hand side of the operator
-    # @return [Number, Color] The result of the operation
-    # @raise [NoMethodError] if `other` is an invalid type
-    def times(other)
-      if other.is_a? Number
-        operate(other, :*)
-      elsif other.is_a? Color
-        other.times(self)
-      else
-        raise NoMethodError.new(nil, :times)
-      end
-    end
-
-    # The SassScript `/` operation.
-    # Its functionality depends on the type of its argument:
-    #
-    # {Number}
-    # : Divides this number by the other, converting units appropriately.
-    #
-    # {Literal}
-    # : See {Literal#div}.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
-    def div(other)
-      if other.is_a? Number
-        res = operate(other, :/)
-        if self.original && other.original
-          res.original = "#{self.original}/#{other.original}"
-        end
-        res
-      else
-        super
-      end
-    end
-
-    # The SassScript `%` operation.
-    #
-    # @param other [Number] The right-hand side of the operator
-    # @return [Number] This number modulo the other
-    # @raise [NoMethodError] if `other` is an invalid type
-    # @raise [Sass::UnitConversionError] if `other` has any units
-    def mod(other)
-      if other.is_a?(Number)
-        unless other.unitless?
-          raise Sass::UnitConversionError.new("Cannot modulo by a number with units: #{other.inspect}.")
-        end
-        operate(other, :%)
-      else
-        raise NoMethodError.new(nil, :mod)
-      end
-    end
-
-    # The SassScript `==` operation.
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Boolean] Whether this number is equal to the other object
-    def eq(other)
-      return Sass::Script::Bool.new(false) unless other.is_a?(Sass::Script::Number)
-      this = self
-      begin
-        if unitless?
-          this = this.coerce(other.numerator_units, other.denominator_units)
-        else
-          other = other.coerce(@numerator_units, @denominator_units)
-        end
-      rescue Sass::UnitConversionError
-        return Sass::Script::Bool.new(false)
-      end
-
-      Sass::Script::Bool.new(this.value == other.value)
-    end
-
-    # The SassScript `>` operation.
-    #
-    # @param other [Number] The right-hand side of the operator
-    # @return [Boolean] Whether this number is greater than the other
-    # @raise [NoMethodError] if `other` is an invalid type
-    def gt(other)
-      raise NoMethodError.new(nil, :gt) unless other.is_a?(Number)
-      operate(other, :>)
-    end
-
-    # The SassScript `>=` operation.
-    #
-    # @param other [Number] The right-hand side of the operator
-    # @return [Boolean] Whether this number is greater than or equal to the other
-    # @raise [NoMethodError] if `other` is an invalid type
-    def gte(other)
-      raise NoMethodError.new(nil, :gte) unless other.is_a?(Number)
-      operate(other, :>=)
-    end
-
-    # The SassScript `<` operation.
-    #
-    # @param other [Number] The right-hand side of the operator
-    # @return [Boolean] Whether this number is less than the other
-    # @raise [NoMethodError] if `other` is an invalid type
-    def lt(other)
-      raise NoMethodError.new(nil, :lt) unless other.is_a?(Number)
-      operate(other, :<)
-    end
-
-    # The SassScript `<=` operation.
-    #
-    # @param other [Number] The right-hand side of the operator
-    # @return [Boolean] Whether this number is less than or equal to the other
-    # @raise [NoMethodError] if `other` is an invalid type
-    def lte(other)
-      raise NoMethodError.new(nil, :lte) unless other.is_a?(Number)
-      operate(other, :<=)
-    end
-
-    # @return [String] The CSS representation of this number
-    # @raise [Sass::SyntaxError] if this number has units that can't be used in CSS
-    #   (e.g. `px*in`)
-    def to_s(opts = {})
-      return original if original
-      raise Sass::SyntaxError.new("#{inspect} isn't a valid CSS value.") unless legal_units?
-      inspect
-    end
-
-    # Returns a readable representation of this number.
-    #
-    # This representation is valid CSS (and valid SassScript)
-    # as long as there is only one unit.
-    #
-    # @return [String] The representation
-    def inspect(opts = {})
-      value = self.class.round(self.value)
-      unitless? ? value.to_s : "#{value}#{unit_str}"
-    end
-    alias_method :to_sass, :inspect
-
-    # @return [Fixnum] The integer value of the number
-    # @raise [Sass::SyntaxError] if the number isn't an integer
-    def to_i
-      super unless int?
-      return value
-    end
-
-    # @return [Boolean] Whether or not this number is an integer.
-    def int?
-      value % 1 == 0.0
-    end
-
-    # @return [Boolean] Whether or not this number has no units.
-    def unitless?
-      @numerator_units.empty? && @denominator_units.empty?
-    end
-
-    # @return [Boolean] Whether or not this number has units that can be represented in CSS
-    #   (that is, zero or one \{#numerator\_units}).
-    def legal_units?
-      (@numerator_units.empty? || @numerator_units.size == 1) && @denominator_units.empty?
-    end
-
-    # Returns this number converted to other units.
-    # The conversion takes into account the relationship between e.g. mm and cm,
-    # as well as between e.g. in and cm.
-    #
-    # If this number has no units, it will simply return itself
-    # with the given units.
-    #
-    # An incompatible coercion, e.g. between px and cm, will raise an error.
-    #
-    # @param num_units [Array<String>] The numerator units to coerce this number into.
-    #   See {\#numerator\_units}
-    # @param den_units [Array<String>] The denominator units to coerce this number into.
-    #   See {\#denominator\_units}
-    # @return [Number] The number with the new units
-    # @raise [Sass::UnitConversionError] if the given units are incompatible with the number's
-    #   current units
-    def coerce(num_units, den_units)
-      Number.new(if unitless?
-                   self.value
-                 else
-                   self.value * coercion_factor(@numerator_units, num_units) /
-                     coercion_factor(@denominator_units, den_units)
-                 end, num_units, den_units)
-    end
-
-    # @param other [Number] A number to decide if it can be compared with this number.
-    # @return [Boolean] Whether or not this number can be compared with the other.
-    def comparable_to?(other)
-      begin
-        operate(other, :+)
-        true
-      rescue Sass::UnitConversionError
-        false
-      end
-    end
-
-    # Returns a human readable representation of the units in this number.
-    # For complex units this takes the form of:
-    # numerator_unit1 * numerator_unit2 / denominator_unit1 * denominator_unit2
-    # @return [String] a string that represents the units in this number
-    def unit_str
-      rv = @numerator_units.sort.join("*")
-      if @denominator_units.any?
-        rv << "/"
-        rv << @denominator_units.sort.join("*")
-      end
-      rv
-    end
-
-    private
-
-    # @private
-    def self.round(num)
-      if num.is_a?(Float) && (num.infinite? || num.nan?)
-        num
-      elsif num % 1 == 0.0
-        num.to_i
-      else
-        (num * self.precision_factor).round / self.precision_factor
-      end
-    end
-
-    OPERATIONS = [:+, :-, :<=, :<, :>, :>=]
-
-    def operate(other, operation)
-      this = self
-      if OPERATIONS.include?(operation)
-        if unitless?
-          this = this.coerce(other.numerator_units, other.denominator_units)
-        else
-          other = other.coerce(@numerator_units, @denominator_units)
-        end
-      end
-      # avoid integer division
-      value = (:/ == operation) ? this.value.to_f : this.value
-      result = value.send(operation, other.value)
-
-      if result.is_a?(Numeric)
-        Number.new(result, *compute_units(this, other, operation))
-      else # Boolean op
-        Bool.new(result)
-      end
-    end
-
-    def coercion_factor(from_units, to_units)
-      # get a list of unmatched units
-      from_units, to_units = sans_common_units(from_units, to_units)
-
-      if from_units.size != to_units.size || !convertable?(from_units | to_units)
-        raise Sass::UnitConversionError.new("Incompatible units: '#{from_units.join('*')}' and '#{to_units.join('*')}'.")
-      end
-
-      from_units.zip(to_units).inject(1) {|m,p| m * conversion_factor(p[0], p[1]) }
-    end
-
-    def compute_units(this, other, operation)
-      case operation
-      when :*
-        [this.numerator_units + other.numerator_units, this.denominator_units + other.denominator_units]
-      when :/
-        [this.numerator_units + other.denominator_units, this.denominator_units + other.numerator_units]
-      else  
-        [this.numerator_units, this.denominator_units]
-      end
-    end
-
-    def normalize!
-      return if unitless?
-      @numerator_units, @denominator_units = sans_common_units(@numerator_units, @denominator_units)
-
-      @denominator_units.each_with_index do |d, i|
-        if convertable?(d) && (u = @numerator_units.detect(&method(:convertable?)))
-          @value /= conversion_factor(d, u)
-          @denominator_units.delete_at(i)
-          @numerator_units.delete_at(@numerator_units.index(u))
-        end
-      end
-    end
-
-    # A hash of unit names to their index in the conversion table
-    CONVERTABLE_UNITS = {"in" => 0,        "cm" => 1,    "pc" => 2,    "mm" => 3,   "pt" => 4}
-    CONVERSION_TABLE = [[ 1,                2.54,         6,            25.4,        72        ], # in
-                        [ nil,              1,            2.36220473,   10,          28.3464567], # cm
-                        [ nil,              nil,          1,            4.23333333,  12        ], # pc
-                        [ nil,              nil,          nil,          1,           2.83464567], # mm
-                        [ nil,              nil,          nil,          nil,         1         ]] # pt
-
-    def conversion_factor(from_unit, to_unit)
-      res = CONVERSION_TABLE[CONVERTABLE_UNITS[from_unit]][CONVERTABLE_UNITS[to_unit]]
-      return 1.0 / conversion_factor(to_unit, from_unit) if res.nil?
-      res
-    end
-
-    def convertable?(units)
-      Array(units).all? {|u| CONVERTABLE_UNITS.include?(u)}
-    end
-
-    def sans_common_units(units1, units2)
-      units2 = units2.dup
-      # Can't just use -, because we want px*px to coerce properly to px*mm
-      return units1.map do |u|
-        next u unless j = units2.index(u)
-        units2.delete_at(j)
-        nil
-      end.compact, units2
-    end
-  end
-end